Muehlenhoff has submitted this change and it was merged.

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


terbium: Use the role keyword

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

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index e194291..04d82c3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2422,21 +2422,15 @@
 
 # https://wikitech.wikimedia.org/wiki/Terbium
 node 'terbium.eqiad.wmnet' {
-    include role::mediawiki::common
-    include role::db::maintenance
-    include role::peopleweb
+    role mediawiki::common, db::maintenance, peopleweb, noc, 
mediawiki::searchmonitor, mediawiki::maintenance, backup::host
     include misc::monitoring::jobqueue
     include scap::scripts
-    include role::noc
-    include role::mediawiki::searchmonitor
-    include role::mediawiki::maintenance
     include ldap::role::client::labs
 
     package { 'python-mysqldb':
         ensure => installed,
     }
 
-    include role::backup::host
     backup::set {'home': }
 
     # The eventlogging code is useful for scripting

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90f9303d57aa8ddee5ce91d086dd1110d885c523
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Dzahn <[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