Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/239847
Change subject: Move base::firewall include into the roles
......................................................................
Move base::firewall include into the roles
All occurances of restbase/cassandra are now ferm-enabled, so move
the base::firewall include into the roles.
Change-Id: Id2ecbe1614aa283ae3efa1dbaa7d09ffb2de0b35
---
M manifests/role/cassandra.pp
M manifests/role/restbase.pp
M manifests/site.pp
3 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/239847/1
diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 551b3d5..8ca51a5 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -2,6 +2,7 @@
#
class role::cassandra {
include ::passwords::cassandra
+ include base::firewall
# Parameters to be set by Hiera
class { '::cassandra': }
diff --git a/manifests/role/restbase.pp b/manifests/role/restbase.pp
index 4e2dead..44d613a 100644
--- a/manifests/role/restbase.pp
+++ b/manifests/role/restbase.pp
@@ -9,6 +9,7 @@
system::role { 'restbase': description => "Restbase ${::realm}" }
include ::passwords::cassandra
+ include base::firewall
include ::restbase
include ::restbase::monitoring
diff --git a/manifests/site.pp b/manifests/site.pp
index 8df1779..8703375 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -336,14 +336,12 @@
# cerium, praseodymium and xenon are Cassandra test hosts
node /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ {
role restbase, cassandra
- include base::firewall
include standard
}
# cassandra multi-dc temporary test T111382
node /^restbase-test200[1-3]\.codfw\.wmnet$/ {
role restbase, cassandra
- include base::firewall
include standard
}
@@ -2345,7 +2343,6 @@
# restbase eqiad cluster
node /^restbase100[1-9]\.eqiad\.wmnet$/ {
role restbase, cassandra
- include base::firewall
include standard
}
--
To view, visit https://gerrit.wikimedia.org/r/239847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2ecbe1614aa283ae3efa1dbaa7d09ffb2de0b35
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
