Merge "Move RabbitMQ settings out of controller.yaml"

[apex-tripleo-heat-templates.git] / overcloud.yaml

diff --git a/overcloud.yaml b/overcloud.yaml
index a4f8fee..b88d1dc 100644 (file)
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -399,15 +399,11 @@ resources:
           controllerExtraConfig: {get_param: controllerExtraConfig}
           HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
           HorizonSecret: {get_resource: HorizonSecret}
-          MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]}
-          MysqlRootPassword: {get_attr: [MysqlRootPassword, value]}
           PcsdPassword: {get_resource: PcsdPassword}
-          RabbitCookie: {get_attr: [RabbitCookie, value]}
           RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
           RedisVirtualIPUri: {get_attr: [RedisVirtualIP, ip_address_uri]}
           ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
           EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
-          MysqlVirtualIP: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, MysqlNetwork]}]}
           Hostname:
             str_replace:
               template: {get_param: ControllerHostnameFormat}
@@ -612,11 +608,6 @@ resources:
     properties:
       length: 10
 
-  MysqlClusterUniquePart:
-    type: OS::Heat::RandomString
-    properties:
-      length: 10
-
   RabbitCookie:
     type: OS::Heat::RandomString
     properties:
@@ -627,7 +618,6 @@ resources:
     type: OS::TripleO::DefaultPasswords
     properties:
       DefaultMysqlRootPassword: {get_attr: [MysqlRootPassword, value]}
-      DefaultMysqlClusterPassword: {get_attr: [MysqlClusterUniquePart, value]}
       DefaultRabbitCookie: {get_attr: [RabbitCookie, value]}
       DefaultHeatAuthEncryptionKey: {get_attr: [HeatAuthEncryptionKey, value]}
       DefaultPcsdPassword: {get_attr: [PcsdPassword, value]}