Rush has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/135094

Change subject: misc admin yaml includes
......................................................................

misc admin yaml includes

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/135094/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 94b4fa7..8655186 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -320,8 +320,8 @@
         interface => 'eth0',
     }
 
+    include admin
     include standard
-    include admins::roots
     include misc::management::ipmi
     include role::installserver::tftp-server
 
@@ -336,20 +336,20 @@
 }
 
 node 'beryllium.wikimedia.org' {
+    include admin
     include standard-noexim
 }
 
 node 'boron.wikimedia.org' {
+    include admin
     include standard-noexim
 }
 
 node 'calcium.wikimedia.org' {
     $cluster = 'misc'
 
+    include admin
     include standard
-    include groups::wikidev
-    include accounts::robh
-
 }
 
 node 'carbon.wikimedia.org' {
@@ -360,6 +360,7 @@
         interface => 'eth0',
     }
 
+    include admin
     include standard
     include backup::client
     include role::installserver
@@ -370,6 +371,7 @@
 
     class { 'base::firewall': }
 
+    include admin
     include standard
     include role::releases
 }
@@ -399,6 +401,7 @@
 }
 
 node /^(chromium|hydrogen)\.wikimedia\.org$/ {
+    include admin
     include standard
     include role::dns::recursor
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a5f4bc092434392f022939585384a75e2b5ca70
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>

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

Reply via email to