Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/353123 )
Change subject: authdns::server: move 'include standard' to role
......................................................................
authdns::server: move 'include standard' to role
Change-Id: Ic63b1f5fdffd81a1df0153d9c6054f0f7dd6a591
---
M manifests/site.pp
M modules/role/manifests/authdns/server.pp
2 files changed, 4 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/353123/1
diff --git a/manifests/site.pp b/manifests/site.pp
index cd87b08..f036e81 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -134,11 +134,7 @@
node 'baham.wikimedia.org' {
role(authdns::server)
-
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
- include ::standard
+ interface::add_ip6_mapped { 'main': interface => 'eth0', }
}
# Bastion in Virginia
@@ -905,11 +901,7 @@
node 'eeden.wikimedia.org' {
role(authdns::server)
-
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
- include ::standard
+ interface::add_ip6_mapped { 'main': interface => 'eth0', }
}
# icinga based monitoring hosts (einsteinium = eqiad, tegmen = codfw)
@@ -2394,11 +2386,7 @@
node 'radon.wikimedia.org' {
role(authdns::server)
-
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
- include ::standard
+ interface::add_ip6_mapped { 'main': interface => 'eth0', }
}
# Live Recent Changes WebSocket stream
diff --git a/modules/role/manifests/authdns/server.pp
b/modules/role/manifests/authdns/server.pp
index 2320679..aecfe94 100644
--- a/modules/role/manifests/authdns/server.pp
+++ b/modules/role/manifests/authdns/server.pp
@@ -2,6 +2,7 @@
class role::authdns::server {
system::role { 'authdns': description => 'Authoritative DNS server' }
+ include ::standard
include ::base::firewall
include authdns::ganglia
include prometheus::node_gdnsd
--
To view, visit https://gerrit.wikimedia.org/r/353123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic63b1f5fdffd81a1df0153d9c6054f0f7dd6a591
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
