Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234484
Change subject: also enable ferm on strontium (also move it to the role now)
......................................................................
also enable ferm on strontium (also move it to the role now)
Change-Id: I1efc8f8cf2300442f58a5e539ef7cd26b41e1edc
---
M manifests/role/puppetmaster.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/234484/1
diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
index a28d248..83caf4a 100644
--- a/manifests/role/puppetmaster.pp
+++ b/manifests/role/puppetmaster.pp
@@ -36,6 +36,7 @@
class role::puppetmaster::backend {
include passwords::puppet::database
+ include base::firewall
system::role { 'puppetmaster':
description => 'Puppetmaster backend'
diff --git a/manifests/site.pp b/manifests/site.pp
index b7e2923..c6ca658 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2204,9 +2204,6 @@
node /^(strontium|rhodium).eqiad.wmnet/ {
include standard
include role::puppetmaster::backend
- if $::hostname == 'rhodium' {
- include base::firewall
- }
}
node 'stat1001.eqiad.wmnet' {
--
To view, visit https://gerrit.wikimedia.org/r/234484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1efc8f8cf2300442f58a5e539ef7cd26b41e1edc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
