diff options
author | Dan Prince <dprince@redhat.com> | 2016-08-17 10:15:05 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2016-08-23 21:29:02 -0400 |
commit | 58bf3932a86f2f5582937e3da8cb74dfd29c116b (patch) | |
tree | a6c333ff1d54f7d89807c8589149ae1287d3765d /overcloud.yaml | |
parent | a95e4c2afe614064f2ec8417f13b7b9719fc5e31 (diff) |
Move MySQL settings out of puppet/controller.yaml
This moves the config settings out of controller.yaml for MySQL
and into puppet/services/database/mysql.yaml.
The top leve MysqlRootPassword is still maintained by default
in overcloud.yaml so that users who upgrade won't get
broken. New users may optionally specify the MysqlRootPassword
as a parameter instead which will take priority over the top
level generated parameter.
We drop the top level MysqlClusterUniquePart because it is no
longer used (I think it was a remnant from t-i-e).
Related-Bug: #1604414
Change-Id: I06ebac0f4c87dabfccefb2e550a64650868c5b26
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]} |