diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-19 13:17:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-19 13:17:50 +0000 |
| commit | b7363014fe38503a8a73430b57ec244a1b9d1a8f (patch) | |
| tree | efb201c9151d7d9566fbae4513128e29a0935e3d | |
| parent | 1192fb70d6e0e867887b0ff8e7b16fac005ea3c2 (diff) | |
| parent | e01f11cc43533d8d59b1144759bb38b4d8160eb0 (diff) | |
Merge "Set the MySQL root password"
| -rw-r--r-- | overcloud-source.yaml | 5 | ||||
| -rw-r--r-- | undercloud-source.yaml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 93a68344..bca88cc6 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -295,6 +295,10 @@ resources: type: OS::Heat::RandomString properties: length: 10 + MysqlRootPassword: + type: OS::Heat::RandomString + properties: + length: 10 PublicVirtualIP: type: OS::Neutron::Port properties: @@ -482,6 +486,7 @@ resources: mysql: innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize} local_bind: true + root-password: {get_resource: MysqlRootPassword} nodes: Merge::Map: controller0: diff --git a/undercloud-source.yaml b/undercloud-source.yaml index e09b3db5..8b29df1e 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -188,6 +188,10 @@ resources: length: 20 salt: get_param: RabbitCookieSalt + MysqlRootPassword: + type: OS::Heat::RandomString + properties: + length: 10 undercloudConfig: type: OS::Heat::StructuredConfig properties: @@ -270,6 +274,7 @@ resources: signing_certificate: {get_param: KeystoneSigningCertificate} mysql: innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize} + root-password: {get_resource: MysqlRootPassword} neutron: host: 127.0.0.1 ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8 |