diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-24 08:59:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-24 08:59:43 +0000 |
| commit | 4a61f7570b583e5038bd9705a7d707f2768ace3a (patch) | |
| tree | 19a777bb09c209b8865415934e1d63fd4199d60f /overcloud.yaml | |
| parent | 1c8b5fa5d7d633d156e761d21ff60188eb43701f (diff) | |
| parent | 58bf3932a86f2f5582937e3da8cb74dfd29c116b (diff) | |
Merge "Move MySQL settings out of puppet/controller.yaml"
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index a4f8fee1..0e195a48 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -399,15 +399,12 @@ 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 +609,6 @@ resources: properties: length: 10 - MysqlClusterUniquePart: - type: OS::Heat::RandomString - properties: - length: 10 - RabbitCookie: type: OS::Heat::RandomString properties: @@ -627,7 +619,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]} |