Muehlenhoff has submitted this change and it was merged.

Change subject: gallium: Use the role keyword
......................................................................


gallium: Use the role keyword

We need this for Hiera-based assignment of Salt grains for debdeploy

Change-Id: Ic1bc50a2be030830dce3133045a9f4d975f162fe
---
M manifests/site.pp
1 file changed, 1 insertion(+), 4 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 138f159..995519d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1003,6 +1003,7 @@
 
 # Continuous Integration
 node 'gallium.wikimedia.org' {
+    role ci::master, ci::slave, ci::website, zuul::production
 
     $cluster = 'misc'
     $nagios_contact_group = 'admins,contint'
@@ -1016,10 +1017,6 @@
 
     include standard
     include contint::firewall
-    include role::ci::master
-    include role::ci::slave
-    include role::ci::website
-    include role::zuul::production
 
     # gallium received a SSD drive (T82401) mount it
     file { '/srv/ssd':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1bc50a2be030830dce3133045a9f4d975f162fe
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to