Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102666
Change subject: LVS: remove lvs::balancer dependencies on lvs::configuration
......................................................................
LVS: remove lvs::balancer dependencies on lvs::configuration
Introduce extra class parameters which can be referenced from
lvs::configuration
Change-Id: I1068e8f0d36505d4d0dc8354fca9a643abbd654c
---
M manifests/lvs.pp
M manifests/role/lvs.pp
2 files changed, 17 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/102666/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 319fcbc..1e6764f 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -803,11 +803,16 @@
# Class: lvs::balancer
# Parameters:
# - $service_ips: list of service IPs to bind to loopback
+# - $lvs_services: A configuration hash of LVS services
+# - $pybal_global_options: A configuration hash of PyBal global options
+# - $site: Site name used in PyBal configuration
class lvs::balancer(
- $service_ips=[]
+ $service_ips=[],
+ $lvs_services,
+ $pybal_global_options,
+ $site
) {
- require "lvs::configuration"
include pybal
system::role { "lvs::balancer": description => "LVS balancer", ensure
=> absent }
@@ -817,10 +822,10 @@
}
class { 'pybal::configuration':
- global_options => $lvs::configuration::pybal,
- lvs_services => $lvs::configuration::lvs_services,
- lvs_class_hosts => $lvs::configuration::lvs_class_hosts,
- site => $::site
+ global_options => $pybal_global_options,
+ lvs_services => $lvs_services,
+ lvs_class_hosts => $lvs_class_hosts,
+ site => $site
}
# Tune the ip_vs conn_tab_bits parameter
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index 6f06601..392b05e 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -51,7 +51,12 @@
include base,
ganglia
- class { "::lvs::balancer": service_ips => $lvs_balancer_ips }
+ class { "::lvs::balancer":
+ service_ips => $lvs_balancer_ips,
+ lvs_services => $lvs::configuration::lvs_services,
+ lvs_class_hosts => $lvs::configuration::lvs_class_hosts,
+ site => $::site
+ }
if $::site in ['pmtpa', 'eqiad'] {
include ::lvs::balancer::runcommand
--
To view, visit https://gerrit.wikimedia.org/r/102666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1068e8f0d36505d4d0dc8354fca9a643abbd654c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
