Rush has submitted this change and it was merged.
Change subject: misc admin yaml includes
......................................................................
misc admin yaml includes
Change-Id: I7a5f4bc092434392f022939585384a75e2b5ca70
---
M manifests/site.pp
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index d3e1229..383227f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -324,8 +324,8 @@
interface => 'eth0',
}
+ include admin
include standard
- include admins::roots
include misc::management::ipmi
include role::installserver::tftp-server
@@ -340,20 +340,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' {
@@ -364,6 +364,7 @@
interface => 'eth0',
}
+ include admin
include standard
include backup::client
include role::installserver
@@ -374,6 +375,7 @@
class { 'base::firewall': }
+ include admin
include standard
include role::releases
}
@@ -398,6 +400,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: merged
Gerrit-Change-Id: I7a5f4bc092434392f022939585384a75e2b5ca70
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
