Populate vnc_api_lib.ini on compute nodes with OpenContrail

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

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 4fec295..1656aea 100644 (file)
--- 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:
@@ -318,9 +314,9 @@ resources:
             - service_names
             - controller
             - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
-            - bootstrap_node # provided by BootstrapNodeConfig
+            - bootstrap_node # provided by allNodesConfig
             - all_nodes # provided by allNodesConfig
-            - vip_data # provided by vip-config
+            - vip_data # provided by allNodesConfig
             - '"%{::osfamily}"'
             - cinder_dellsc_data # Optionally provided by ControllerExtraConfigPre
             - cinder_netapp_data # Optionally provided by ControllerExtraConfigPre
@@ -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}