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

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}