Mark Bergsma has submitted this change and it was merged.
Change subject: Attempt to fix undefined param in dns::recursor
......................................................................
Attempt to fix undefined param in dns::recursor
Change-Id: I95fc510467e417e2bebe1fff3ada0e15e015edfb
---
M manifests/role/lvs.pp
M templates/powerdns/recursor.conf.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index 0b1d1e3..6e47028 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -10,7 +10,7 @@
# Older PyBal is very dependent on recursive DNS, to the point where it is
a SPOF
# So we'll have every LVS server run their own recursor
$nameservers_prefix = [ $::ipaddress ]
- include dns::recursor
+ class { 'dns::recursor': listen_address => [ $::ipaddress ] }
include lvs::configuration
$sip = $lvs::configuration::lvs_service_ips[$::realm]
diff --git a/templates/powerdns/recursor.conf.erb
b/templates/powerdns/recursor.conf.erb
index 684bc1c..e6a198d 100644
--- a/templates/powerdns/recursor.conf.erb
+++ b/templates/powerdns/recursor.conf.erb
@@ -30,7 +30,7 @@
#
# allow-from=127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12, ::1/128,
fe80::/10
-allow-from=127.0.0.0/8, ::1/128, <%= (allow_from +
flatten_ips(listen_addresses)).join(", ") %>
+allow-from=127.0.0.0/8, ::1/128, <%= (@allow_from +
flatten_ips(@listen_addresses)).join(", ") %>
#################################
# auth-can-lower-ttl If we follow RFC 2181 to the letter, an authoritative
server can lower the TTL of NS records
--
To view, visit https://gerrit.wikimedia.org/r/102644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95fc510467e417e2bebe1fff3ada0e15e015edfb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
