diff options
| author |   Yanis Guenane <yanis.guenane@enovance.com> | 2015-03-26 16:54:48 +0100 |
|---|---|---|
| committer | Yanis Guenane <yanis.guenane@enovance.com> | 2015-03-31 10:41:27 +0200 |
| commit | 2520176436ec46e7b48664a5d041dc55ca231136 (patch) | |
| tree | 5da5c3a09c0924d0f8ed0c6b65eec3dfdefe1329 /puppet | |
| parent | f9b98d4c576d84be7167f1b728179d32a018a1a1 (diff) | |
lb: Allow multiple backend
Currently tripleo::loadbalancer allow a controller to have only itself
as a backend for a service, no matter the number of controller nodes.
This patch fixes that using all controller nodes available.
Change-Id: Ic8fc022b84850c669b19d37da7f275d9c811e694
Depends-On: I2a46c250bc3325eef9c3128cac2ab45c88b1ae75
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 4 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 5 |
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 bad5fdb7..4269e035 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, + } } |