[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: one role() call in ruthenium, tungsten

2018-01-08 Thread Giuseppe Lavagetto (Code Review)
Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402840 )

Change subject: site.pp: one role() call in ruthenium, tungsten
..


site.pp: one role() call in ruthenium, tungsten

Change-Id: I9be3214609e84741116834cea1f7eac8eea9e886
---
M manifests/site.pp
1 file changed, 7 insertions(+), 4 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 9706cb2..3fafc42 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1943,9 +1943,11 @@
 # Right now, both rt-server and rt-clients run on the same node
 # But, we are likely going to split them into different boxes soon.
 node 'ruthenium.eqiad.wmnet' {
-role(test,
-parsoid::testing, parsoid::rt_server, parsoid::rt_client,
-parsoid::vd_server, parsoid::vd_client, parsoid::diffserver)
+role(parsoid::testing)
+include ::role::test
+include ::role::parsoid::rt_server, ::role::parsoid::vd_server
+include ::role::parsoid::rt_client, ::role::parsoid::vd_client
+include ::role::parsoid::diffserver
 }
 
 # cluster management (cumin master)
@@ -2112,7 +2114,8 @@
 
 # test system for performance team (T117888)
 node 'tungsten.eqiad.wmnet' {
-role(test, xhgui::app)
+role(xhgui::app)
+include ::role::test
 }
 
 # replaced magnesium (RT) (T119112 T123713)

-- 
To view, visit https://gerrit.wikimedia.org/r/402840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9be3214609e84741116834cea1f7eac8eea9e886
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: one role() call in ruthenium, tungsten

2018-01-08 Thread Giuseppe Lavagetto (Code Review)
Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402840 )

Change subject: site.pp: one role() call in ruthenium, tungsten
..

site.pp: one role() call in ruthenium, tungsten

Change-Id: I9be3214609e84741116834cea1f7eac8eea9e886
---
M manifests/site.pp
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/402840/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 9706cb2..3fafc42 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1943,9 +1943,11 @@
 # Right now, both rt-server and rt-clients run on the same node
 # But, we are likely going to split them into different boxes soon.
 node 'ruthenium.eqiad.wmnet' {
-role(test,
-parsoid::testing, parsoid::rt_server, parsoid::rt_client,
-parsoid::vd_server, parsoid::vd_client, parsoid::diffserver)
+role(parsoid::testing)
+include ::role::test
+include ::role::parsoid::rt_server, ::role::parsoid::vd_server
+include ::role::parsoid::rt_client, ::role::parsoid::vd_client
+include ::role::parsoid::diffserver
 }
 
 # cluster management (cumin master)
@@ -2112,7 +2114,8 @@
 
 # test system for performance team (T117888)
 node 'tungsten.eqiad.wmnet' {
-role(test, xhgui::app)
+role(xhgui::app)
+include ::role::test
 }
 
 # replaced magnesium (RT) (T119112 T123713)

-- 
To view, visit https://gerrit.wikimedia.org/r/402840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9be3214609e84741116834cea1f7eac8eea9e886
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits