Mark Bergsma has submitted this change and it was merged.
Change subject: Attempt to fix new class resource conflict
......................................................................
Attempt to fix new class resource conflict
Change-Id: I5f86b0ec2a469bfb2d81d5ca26ba81c8f12bcfc3
---
M manifests/role/lvs.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index d8d1c30..6f06601 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 ]
- class { '::dns::recursor': listen_addresses => [ $::ipaddress ] }
+ include ::dns::recursor
include lvs::configuration
$sip = $lvs::configuration::lvs_service_ips[$::realm]
--
To view, visit https://gerrit.wikimedia.org/r/102653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f86b0ec2a469bfb2d81d5ca26ba81c8f12bcfc3
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
