Dzahn has submitted this change and it was merged.
Change subject: Move base::firewall include into the racktables and rt roles
......................................................................
Move base::firewall include into the racktables and rt roles
Change-Id: I236c32e88cebd046df7817fdabaa1046f3f20842
---
M manifests/role/racktables.pp
M manifests/role/requesttracker.pp
M manifests/site.pp
3 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/racktables.pp b/manifests/role/racktables.pp
index fb32abe..2f87867 100644
--- a/manifests/role/racktables.pp
+++ b/manifests/role/racktables.pp
@@ -9,6 +9,7 @@
system::role { 'role::racktables': description => 'Racktables' }
include standard
+ include base::firewall
# be flexible about labs vs. prod
case $::realm {
diff --git a/manifests/role/requesttracker.pp b/manifests/role/requesttracker.pp
index b744b43..59886d9 100644
--- a/manifests/role/requesttracker.pp
+++ b/manifests/role/requesttracker.pp
@@ -3,6 +3,7 @@
system::role { 'requesttracker': description => 'RT' }
include passwords::misc::rt
+ include base::firewall
sslcert::certificate { 'rt.wikimedia.org': }
diff --git a/manifests/site.pp b/manifests/site.pp
index 870d859..caa053c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1790,8 +1790,6 @@
$cluster = 'misc'
- include base::firewall
-
role racktables, requesttracker
interface::add_ip6_mapped { 'main':
--
To view, visit https://gerrit.wikimedia.org/r/245962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I236c32e88cebd046df7817fdabaa1046f3f20842
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
