Dzahn has submitted this change and it was merged.
Change subject: Include base::firewall into the planet role
......................................................................
Include base::firewall into the planet role
Change-Id: I2d27da645a03ef807ab0c09e6bd024ec022d30e7
---
M manifests/role/planet.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index 0106a6c..045e8d1 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -2,6 +2,8 @@
class role::planet {
+ include base::firewall
+
system::role { 'role::planet': description => 'Planet (venus) weblog
aggregator' }
# be flexible about labs vs. prod
diff --git a/manifests/site.pp b/manifests/site.pp
index 5c6e197..5083127 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2269,7 +2269,6 @@
# virtual machine hosting
https://wikitech.wikimedia.org/wiki/Planet.wikimedia.org
node 'planet1001.eqiad.wmnet' {
- include base::firewall
include role::planet
}
--
To view, visit https://gerrit.wikimedia.org/r/245970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d27da645a03ef807ab0c09e6bd024ec022d30e7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
