diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-05-31 12:40:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-05-31 12:40:32 +0000 |
commit | 9f45b39cd880980640cf369382dd92c35424e1ca (patch) | |
tree | d3ad342a3efd71ff4028568c8ad61bdb69910de8 /puppet/vip-config.yaml | |
parent | e3cc44579c0e632eb72c3ea9f58f2ab2bc27a251 (diff) | |
parent | 4087aff69b13843ab73538c65b4b5823d46fb629 (diff) |
Merge "loadbalancer: update hiera parameters for HAproxy/keepalived split"
Diffstat (limited to 'puppet/vip-config.yaml')
-rw-r--r-- | puppet/vip-config.yaml | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/puppet/vip-config.yaml b/puppet/vip-config.yaml index 3e8e9182..92234b6c 100644 --- a/puppet/vip-config.yaml +++ b/puppet/vip-config.yaml @@ -32,11 +32,20 @@ resources: horizon_vip: {get_input: horizon_vip} redis_vip: {get_input: redis_vip} mysql_vip: {get_input: mysql_vip} - tripleo::loadbalancer::public_virtual_ip: {get_input: public_virtual_ip} - tripleo::loadbalancer::controller_virtual_ip: {get_input: control_virtual_ip} - tripleo::loadbalancer::internal_api_virtual_ip: {get_input: internal_api_virtual_ip} - tripleo::loadbalancer::storage_virtual_ip: {get_input: storage_virtual_ip} - tripleo::loadbalancer::storage_mgmt_virtual_ip: {get_input: storage_mgmt_virtual_ip} + public_virtual_ip: {get_input: public_virtual_ip} + controller_virtual_ip: {get_input: control_virtual_ip} + internal_api_virtual_ip: {get_input: internal_api_virtual_ip} + storage_virtual_ip: {get_input: storage_virtual_ip} + storage_mgmt_virtual_ip: {get_input: storage_mgmt_virtual_ip} + # public_virtual_ip and controller_virtual_ip are needed in + # both HAproxy & keepalived. + tripleo::haproxy::public_virtual_ip: {get_input: public_virtual_ip} + tripleo::haproxy::controller_virtual_ip: {get_input: control_virtual_ip} + tripleo::keepalived::public_virtual_ip: {get_input: public_virtual_ip} + tripleo::keepalived::controller_virtual_ip: {get_input: control_virtual_ip} + tripleo::keepalived::internal_api_virtual_ip: {get_input: internal_api_virtual_ip} + tripleo::keepalived::storage_virtual_ip: {get_input: storage_virtual_ip} + tripleo::keepalived::storage_mgmt_virtual_ip: {get_input: storage_mgmt_virtual_ip} tripleo::redis_notification::haproxy_monitor_ip: {get_input: control_virtual_ip} |