Muehlenhoff has submitted this change and it was merged.
Change subject: Move dnsrecursor to the role keyword
......................................................................
Move dnsrecursor to the role keyword
We need that for role-based assignment of Hiera data for debdeploy.
Change-Id: Ie7d7531a2ef37a902ea1987b3014f37316249d3e
---
M manifests/site.pp
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index b068d1f..2148f9b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,9 +48,8 @@
# Node definitions (alphabetic order)
node /^(acamar|achernar)\.wikimedia\.org$/ {
+ role dnsrecursor
include standard
-
- include role::dnsrecursor
interface::add_ip6_mapped { 'main':
interface => 'eth0',
@@ -335,8 +334,8 @@
}
node /^(chromium|hydrogen)\.wikimedia\.org$/ {
+ role dnsrecursor
include standard
- include role::dnsrecursor
if $::hostname == 'chromium' {
$url_downloader_ip = hiera('url_downloader_ip')
@@ -1737,8 +1736,8 @@
}
node 'maerlant.wikimedia.org' {
+ role dnsrecursor
include standard
- include role::dnsrecursor
interface::add_ip6_mapped { 'main':
interface => 'eth0',
@@ -2120,8 +2119,8 @@
}
node 'nescio.wikimedia.org' {
+ role dnsrecursor
include standard
- include role::dnsrecursor
interface::add_ip6_mapped { 'main':
interface => 'eth0',
--
To view, visit https://gerrit.wikimedia.org/r/246244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7d7531a2ef37a902ea1987b3014f37316249d3e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[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
