Merge "Set the MySQL root password"

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 93a6834..bca88cc 100644 (file)
--- 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 e09b3db..8b29df1 100644 (file)
--- 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