openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "lb: Allow multiple backend"

Browse Source
This commit is contained in:
Jenkins 2015-03-31 19:38:50 +00:00 committed by Gerrit Code Review
commit 8eec7d7758
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/all-nodes-config.yaml
View File

@ -50,6 +50,10 @@ resources:
datafiles: datafiles:
all_nodes: all_nodes:
mapped_data: mapped_data:
controller_node_ips:
list_join:
- ','
- {get_param: controller_ips}
rabbit_node_names: rabbit_node_names:
list_join: list_join:
- ',' - ','

1
puppet/controller-puppet.yaml
View File

@ -772,7 +772,6 @@ resources:
controller_virtual_ip: {get_input: controller_virtual_ip} controller_virtual_ip: {get_input: controller_virtual_ip}
public_virtual_interface: {get_input: public_virtual_interface} public_virtual_interface: {get_input: public_virtual_interface}
public_virtual_ip: {get_input: public_virtual_ip} 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::control_virtual_interface: {get_input: control_virtual_interface}
tripleo::loadbalancer::controller_virtual_ip: {get_input: controller_virtual_ip} tripleo::loadbalancer::controller_virtual_ip: {get_input: controller_virtual_ip}
tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface} tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface}

5
puppet/manifests/overcloud_controller.pp
View File

@ -26,7 +26,10 @@ if !str2bool(hiera('enable_package_install', 'false')) {
if hiera('step') >= 1 { if hiera('step') >= 1 {
include ::tripleo::loadbalancer $controller_node_ips = split(downcase(hiera('controller_node_ips')), ',')
class { '::tripleo::loadbalancer' :
controller_hosts => $controller_node_ips,
}
} }