Faidon Liambotis has submitted this change and it was merged.
Change subject: Move base::firewall include into the mx role
......................................................................
Move base::firewall include into the mx role
Change-Id: Ie4c75e273e6fdeca5172f4e2eea6ee0eb6dc9344
---
M manifests/role/mail.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 2f6f11c..a525676 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -14,6 +14,7 @@
) {
include network::constants
include privateexim::aliases::private
+ include base::firewall
system::role { 'role::mail::mx':
description => 'Mail router',
diff --git a/manifests/site.pp b/manifests/site.pp
index 5083127..585380b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2111,7 +2111,6 @@
node 'mx1001.wikimedia.org' {
role mail::mx
include standard
- include base::firewall
interface::add_ip6_mapped { 'main': }
interface::ip { 'wiki-mail-eqiad.wikimedia.org_v4':
@@ -2132,7 +2131,6 @@
node 'mx2001.wikimedia.org' {
role mail::mx
include standard
- include base::firewall
interface::add_ip6_mapped { 'main': }
interface::ip { 'wiki-mail-codfw.wikimedia.org_v4':
--
To view, visit https://gerrit.wikimedia.org/r/245969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4c75e273e6fdeca5172f4e2eea6ee0eb6dc9344
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
