Merge "Set Redis VIP on all nodes"

3 files changed, 5 insertions, 7 deletions

diff --git a/overcloud.yaml b/overcloud.yaml
index 6e039178..0258b0be 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -440,7 +440,6 @@ resources:
         properties:
           CloudDomain: {get_param: CloudDomain}
           controllerExtraConfig: {get_param: controllerExtraConfig}
-          RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
           ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
           EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
           Hostname:
@@ -712,6 +711,7 @@ resources:
       keystone_public_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystonePublicApiNetwork]}]}
       keystone_admin_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]}
       NetVipMap: {get_attr: [VipMap, net_ip_map]}
+      RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
       ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]}
       DeployIdentifier: {get_param: DeployIdentifier}
       UpdateIdentifier: {get_param: UpdateIdentifier}
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 7aa29b24..109fc8fb 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -24,6 +24,9 @@ parameters:
     type: comma_delimited_list
   NetVipMap:
     type: json
+  RedisVirtualIP:
+    type: string
+    default: ''
   ServiceNetMap:
     type: json
   DeployIdentifier:
@@ -153,6 +156,7 @@ resources:
                     internal_api_virtual_ip: {get_param: [NetVipMap, internal_api]}
                     storage_virtual_ip: {get_param: [NetVipMap, storage]}
                     storage_mgmt_virtual_ip: {get_param: [NetVipMap, storage_mgmt]}
+                    redis_vip: {get_param: RedisVirtualIP}
                     # public_virtual_ip and controller_virtual_ip are needed in
                     # both HAproxy & keepalived.
                     tripleo::haproxy::public_virtual_ip: {get_param: [NetVipMap, external]}
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index c85546fa..14848f97 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -62,9 +62,6 @@ parameters:
     default: nic1
     description: What interface to bridge onto br-ex for network nodes.
     type: string
-  RedisVirtualIP:
-    type: string
-    default: ''  # Has to be here because of the ignored empty value bug
   SwiftRawDisks:
     default: {}
     description: 'A hash of additional raw devices to use as Swift backend (eg. {sdb: {}})'
@@ -300,7 +297,6 @@ resources:
         bootstack_nodeid: {get_attr: [Controller, name]}
         enable_load_balancer: {get_param: EnableLoadBalancer}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
-        redis_vip: {get_param: RedisVirtualIP}
 
   # Map heat metadata into hiera datafiles
   ControllerConfig:
@@ -355,8 +351,6 @@ resources:
                 # Pacemaker
                 enable_load_balancer: {get_input: enable_load_balancer}
 
-                # Redis
-                redis_vip: {get_input: redis_vip}
                 # Misc
                 tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}