Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353119 )
Change subject: dnsrecursor: move 'include standard' to role
......................................................................
dnsrecursor: move 'include standard' to role
Change-Id: I6fa652760aeafc846e6ab8541449f41f42b621a4
---
M manifests/site.pp
M modules/role/manifests/dnsrecursor.pp
2 files changed, 1 insertion(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index d9c446c..ac9e71f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,7 +14,6 @@
node /^(acamar|achernar)\.wikimedia\.org$/ {
role(dnsrecursor, ntp)
- include ::standard
interface::add_ip6_mapped { 'main': }
}
@@ -205,7 +204,6 @@
# DNS recursor
node 'chromium.wikimedia.org' {
role(dnsrecursor, ntp)
- include ::standard
interface::add_ip6_mapped { 'main': }
}
@@ -1109,7 +1107,6 @@
# DNS recursor
node 'hydrogen.wikimedia.org' {
role(dnsrecursor, ntp)
- include ::standard
interface::add_ip6_mapped { 'main': }
}
@@ -1774,7 +1771,6 @@
node 'maerlant.wikimedia.org' {
role(dnsrecursor, ntp)
- include ::standard
interface::add_ip6_mapped { 'main': }
}
@@ -2143,7 +2139,6 @@
node 'nescio.wikimedia.org' {
role(dnsrecursor, ntp)
- include ::standard
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/role/manifests/dnsrecursor.pp
b/modules/role/manifests/dnsrecursor.pp
index ce743be..3a2d617 100644
--- a/modules/role/manifests/dnsrecursor.pp
+++ b/modules/role/manifests/dnsrecursor.pp
@@ -3,6 +3,7 @@
class role::dnsrecursor {
system::role { 'role::dnsrecursor': description => 'Recursive DNS server' }
+ include ::standard
include ::lvs::configuration
include ::network::constants
include ::base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/353119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6fa652760aeafc846e6ab8541449f41f42b621a4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
