Mark Bergsma has submitted this change and it was merged. Change subject: Remove obsolete $ipv6_hosts construct ......................................................................
Remove obsolete $ipv6_hosts construct Change-Id: Iff47601ff00fdc89715a128d922f7543efd6295b --- M manifests/lvs.pp M templates/pybal/pybal.conf.erb 2 files changed, 1 insertion(+), 6 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/lvs.pp b/manifests/lvs.pp index d2a1006..8ea52fc 100644 --- a/manifests/lvs.pp +++ b/manifests/lvs.pp @@ -68,10 +68,6 @@ }, } - # This needs to stay in place until the esams MX80 is in production - # amslvs1 and amslvs2 currently can't have ipv6 enabled - $ipv6_hosts = ["lvs1", "lvs2", "lvs3", "lvs4", "lvs5", "lvs6", "lvs1001", "lvs1002", "lvs1003", "lvs1004", "lvs1005", "lvs1006", "amslvs1", "amslvs2", "amslvs3", "amslvs4"] - if $::ipaddress6_eth0 { $v6_ip = $::ipaddress6_eth0 } @@ -795,7 +791,6 @@ include generic::sysfs::enable-rps $lvs_class_hosts = $lvs::configuration::lvs_class_hosts - $ipv6_hosts = $lvs::configuration::ipv6_hosts $pybal = $lvs::configuration::pybal $lvs_services = $lvs::configuration::lvs_services diff --git a/templates/pybal/pybal.conf.erb b/templates/pybal/pybal.conf.erb index a8b8fd5..85e003f 100644 --- a/templates/pybal/pybal.conf.erb +++ b/templates/pybal/pybal.conf.erb @@ -29,7 +29,7 @@ port = <%= service.fetch('port', 80) %> scheduler = <%= service.fetch('scheduler', "wrr") %> config = http://noc.wikimedia.org/pybal/<%= site %>/<%= servicename %> -bgp = <%= subserviceip.include?(":") ? ( ipv6_hosts.include?(scope.lookupvar("::hostname")) ? service.fetch('bgp', "no") : "no" ) : service.fetch('bgp', "no") %> +bgp = <%= service.fetch('bgp', "no") %> depool-threshold = <%= service.fetch('depool-threshold', ".5") %> monitors = <%= service['monitors'].keys.sort.inspect %> -- To view, visit https://gerrit.wikimedia.org/r/71985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff47601ff00fdc89715a128d922f7543efd6295b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits