Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234974
Change subject: Move base::firewall include into the role definitions
......................................................................
Move base::firewall include into the role definitions
Now that all existing swift systems have moved to ferm, move the
include::firewall from site.pp to the respective roles
Change-Id: I6359df383e63397d176c88014b0f31190e1b1dd5
---
M manifests/role/swift.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/74/234974/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 65ae023..b6c5b4e 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -20,6 +20,7 @@
}
include standard
+ include base::firewall
include ::swift::params
include ::swift
include ::swift::ring
@@ -69,6 +70,7 @@
}
include standard
+ include base::firewall
include ::swift::params
include ::swift
include ::swift::ring
diff --git a/manifests/site.pp b/manifests/site.pp
index 694628e..da41c77 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1792,7 +1792,6 @@
# rate limiting purposes (T66622)
node /^ms-fe100[1-4]\.eqiad\.wmnet$/ {
role swift::proxy
- include base::firewall
if $::hostname == 'ms-fe1001' {
include role::swift::stats_reporter
@@ -1804,28 +1803,23 @@
node /^ms-be10(0[0-9]|1[0-5])\.eqiad\.wmnet$/ {
role swift::storage
- include base::firewall
}
# HP machines have different disk ordering T90922
node /^ms-be101[678]\.eqiad\.wmnet$/ {
role swift::storage
- include base::firewall
}
node /^ms-fe300[1-2]\.esams\.wmnet$/ {
role swift::proxy
- include base::firewall
}
node /^ms-be300[1-4]\.esams\.wmnet$/ {
role swift::storage
- include base::firewall
}
node /^ms-fe200[1-4]\.codfw\.wmnet$/ {
role swift::proxy
- include base::firewall
if $::hostname =~ /^ms-fe200[12]$/ {
$ganglia_aggregator = true
@@ -1840,7 +1834,6 @@
node /^ms-be20[0-9][0-9]\.codfw\.wmnet$/ {
role swift::storage
- include base::firewall
}
# mw1001-1016 are jobrunners
--
To view, visit https://gerrit.wikimedia.org/r/234974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6359df383e63397d176c88014b0f31190e1b1dd5
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
