Muehlenhoff has submitted this change and it was merged.
Change subject: dnsrecursor: Move base::firewall include into the role
......................................................................
dnsrecursor: Move base::firewall include into the role
Change-Id: I9ec713971adc7738214c357c49569b08e1e7fd01
---
M manifests/role/dns.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index 4a11c3b..be838d9 100644
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -56,6 +56,7 @@
system::role { 'role::dnsrecursor': description => 'Recursive DNS server' }
include lvs::configuration, network::constants
+ include base::firewall
class {
'lvs::realserver':
diff --git a/manifests/site.pp b/manifests/site.pp
index d2bcfb7..60f09c0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,7 +48,6 @@
# Node definitions (alphabetic order)
node /^(acamar|achernar)\.wikimedia\.org$/ {
- include base::firewall
include standard
include role::dnsrecursor
@@ -342,7 +341,6 @@
}
node /^(chromium|hydrogen)\.wikimedia\.org$/ {
- include base::firewall
include standard
include role::dnsrecursor
@@ -1771,7 +1769,6 @@
node 'maerlant.wikimedia.org' {
include standard
- include base::firewall
include role::dnsrecursor
interface::add_ip6_mapped { 'main':
@@ -2158,7 +2155,6 @@
node 'nescio.wikimedia.org' {
include standard
- include base::firewall
include role::dnsrecursor
interface::add_ip6_mapped { 'main':
--
To view, visit https://gerrit.wikimedia.org/r/244692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ec713971adc7738214c357c49569b08e1e7fd01
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
