X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fvip-config.yaml;h=92234b6c615c5669484d29f7205d24c0be26bd0c;hb=44525fca3aa46aa0fc59e1a44afc2ed098208cc7;hp=c49a10478b0f84e42d83381e97c9f6d216af1751;hpb=795e4290dd6b12a8f4b7c6932a3777a036195081;p=apex-tripleo-heat-templates.git

diff --git a/puppet/vip-config.yaml b/puppet/vip-config.yaml
index c49a1047..92234b6c 100644
--- a/puppet/vip-config.yaml
+++ b/puppet/vip-config.yaml
@@ -16,6 +16,8 @@ resources:
                 keystone_admin_api_vip: {get_input: keystone_admin_api_vip}
                 keystone_public_api_vip: {get_input: keystone_public_api_vip}
                 neutron_api_vip: {get_input: neutron_api_vip}
+                # TODO: pass a `midonet_api_vip` var
+                midonet_api_vip: {get_input: neutron_api_vip}
                 cinder_api_vip: {get_input: cinder_api_vip}
                 glance_api_vip: {get_input: glance_api_vip}
                 glance_registry_vip: {get_input: glance_registry_vip}
@@ -24,15 +26,26 @@ resources:
                 nova_api_vip: {get_input: nova_api_vip}
                 nova_metadata_vip: {get_input: nova_metadata_vip}
                 ceilometer_api_vip: {get_input: ceilometer_api_vip}
+                aodh_api_vip: {get_input: aodh_api_vip}
+                gnocchi_api_vip: {get_input: gnocchi_api_vip}
                 heat_api_vip: {get_input: heat_api_vip}
                 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}