aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-31 19:38:50 +0000
committerGerrit Code Review <review@openstack.org>2015-03-31 19:38:50 +0000
commit8eec7d77584f883456653339eb99976ddea62ea1 (patch)
tree7a4894aafbe02f199a4c174339fa2f25a8969484
parent2f5d1a609e9863beff19d021dae184aecbe75e2c (diff)
parent2520176436ec46e7b48664a5d041dc55ca231136 (diff)
Merge "lb: Allow multiple backend"
-rw-r--r--puppet/all-nodes-config.yaml4
-rw-r--r--puppet/controller-puppet.yaml1
-rw-r--r--puppet/manifests/overcloud_controller.pp5
3 files changed, 8 insertions, 2 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 55acb4b7..4d7af033 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -50,6 +50,10 @@ resources:
datafiles:
all_nodes:
mapped_data:
+ controller_node_ips:
+ list_join:
+ - ','
+ - {get_param: controller_ips}
rabbit_node_names:
list_join:
- ','
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index a013fa15..0fd4e7aa 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -772,7 +772,6 @@ resources:
controller_virtual_ip: {get_input: controller_virtual_ip}
public_virtual_interface: {get_input: public_virtual_interface}
public_virtual_ip: {get_input: public_virtual_ip}
- tripleo::loadbalancer::controller_host: {get_input: controller_host}
tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface}
tripleo::loadbalancer::controller_virtual_ip: {get_input: controller_virtual_ip}
tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface}
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index c27c48d1..88a1684d 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -26,7 +26,10 @@ if !str2bool(hiera('enable_package_install', 'false')) {
if hiera('step') >= 1 {
- include ::tripleo::loadbalancer
+ $controller_node_ips = split(downcase(hiera('controller_node_ips')), ',')
+ class { '::tripleo::loadbalancer' :
+ controller_hosts => $controller_node_ips,
+ }
}