Merge "Add management network to list of networks to ping"

[apex-tripleo-heat-templates.git] / puppet / vip-config.yaml

diff --git a/puppet/vip-config.yaml b/puppet/vip-config.yaml
index 3e8e918..7ce23a2 100644 (file)
--- a/puppet/vip-config.yaml
+++ b/puppet/vip-config.yaml
@@ -23,6 +23,7 @@ resources:
                 glance_registry_vip: {get_input: glance_registry_vip}
                 sahara_api_vip: {get_input: sahara_api_vip}
                 swift_proxy_vip: {get_input: swift_proxy_vip}
+                manila_api_vip: {get_input: manila_api_vip}
                 nova_api_vip: {get_input: nova_api_vip}
                 nova_metadata_vip: {get_input: nova_metadata_vip}
                 ceilometer_api_vip: {get_input: ceilometer_api_vip}
@@ -32,11 +33,21 @@ 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}
+                ironic_api_vip: {get_input: ironic_api_vip}
+                # 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}