X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mysql.yaml;h=3c1658c209f90ac8a19460a2b36758b1e89e8880;hb=6a231fa76cb6e0d1df35bd03f2b830555d5a498f;hp=f8d9262710affea6af6bd5bd73fc3c3e08ad96ad;hpb=5cbb8d3a852d6360c3935d183e85ccb74e283ec6;p=apex-tripleo-heat-templates.git

diff --git a/mysql.yaml b/mysql.yaml
index f8d92627..3c1658c2 100644
--- a/mysql.yaml
+++ b/mysql.yaml
@@ -13,6 +13,14 @@ Parameters:
     Description: Keystone database username.
     Type: String
     Default: keystone
+  HeatUser:
+    Description: Heat database username.
+    Type: String
+    Default: heat
+  GlanceUser:
+    Description: Glance database username.
+    Type: String
+    Default: heat
   MySQLImage:
     Type: String
   BootstrapHost:
@@ -52,37 +60,60 @@ Resources:
   MySQL:
     Type: AWS::EC2::Instance
     Metadata:
-      OpenStack::ImageBuilder::Elements: [ mysql ]
-      OpenStack::Config:
-        mysql:
-          users:
-            root:
-              password: {Ref: BootstrapRootPassword}
-            dump:
-              password: {Ref: BootstrapDumpPassword}
-          create-users:
-            - database: keystone
-              username: {Ref: KeystoneUser}
-              userhandle: {Ref: KeystonePasswordHandle}
-          bootstrap_host: {Ref: BootstrapHost}
-          slave_user: {Ref: BootstrapSlaveUser}
-          slave_password: {Ref: BootstrapSlavePassword}
-        heat:
-          access_key_id:
-            Ref: ApiKey
-          secret_key:
-            Fn::GetAtt: [ ApiKey, SecretAccessKey ]
-          stack:
-            name: {Ref: 'AWS::StackName'}
-            region: {Ref: 'AWS::Region'}
-          refresh:
-            - resource: MySQL
+      OpenStack::ImageBuilder::Elements: [ mysql-migration ]
+      mysql:
+        create-users:
+          - database: keystone
+            username: {Ref: KeystoneUser}
+            userhandle: {Ref: KeystonePasswordHandle}
+          - database: heat
+            username: {Ref: HeatUser}
+            userhandle: {Ref: HeatPasswordHandle}
+          - database: glance
+            username: {Ref: GlanceUser}
+            userhandle: {Ref: GlancePasswordHandle}
+      mysql-migration:
+        users:
+          root:
+            username: root
+            password: {Ref: BootstrapRootPassword}
+          dump:
+            username: dump
+            password: {Ref: BootstrapDumpPassword}
+        bootstrap_host: {Ref: BootstrapHost}
+        slave_user: {Ref: BootstrapSlaveUser}
+        slave_password: {Ref: BootstrapSlavePassword}
+      heat:
+        access_key_id:
+          Ref: ApiKey
+        secret_key:
+          Fn::GetAtt: [ ApiKey, SecretAccessKey ]
+        stack:
+          name: {Ref: 'AWS::StackName'}
+          region: {Ref: 'AWS::Region'}
+        refresh:
+          - resource: MySQL
     Properties:
       ImageId:
         {Ref: MySQLImage}
       InstanceType: {Ref: InstanceType}
       KeyName: {Ref: KeyName}
-      UserData: "#!/bin/bash\ntouch /tmp/userdata-finished\necho Userdata finished $(date)\n"
+  GlancePasswordHandle:
+    Type: AWS::CloudFormation::WaitConditionHandle
+  GlancePassword:
+    DependsOn: MySQL
+    Type: AWS::CloudFormation::WaitCondition
+    Properties:
+      Handle: {Ref: GlancePasswordHandle}
+      Timeout: 90
+  HeatPasswordHandle:
+    Type: AWS::CloudFormation::WaitConditionHandle
+  HeatPassword:
+    DependsOn: MySQL
+    Type: AWS::CloudFormation::WaitCondition
+    Properties:
+      Handle: {Ref: HeatPasswordHandle}
+      Timeout: 90
   KeystonePasswordHandle:
     Type: AWS::CloudFormation::WaitConditionHandle
   KeystonePassword:
@@ -90,10 +121,16 @@ Resources:
     Type: AWS::CloudFormation::WaitCondition
     Properties:
       Handle: {Ref: KeystonePasswordHandle}
-      Timeout: 60
+      Timeout: 90
 Outputs:
     MySQLHost: 
         Fn::GetAtt: [ MySQL , PrivateIp ]
     KeystonePassword:
         Fn::GetAtt: [ KeystonePassword, Data ]
     KeystoneUser: {Ref: KeystoneUser}
+    HeatPassword:
+        Fn::GetAtt: [ HeatPassword, Data ]
+    HeatUser: {Ref: HeatUser}
+    GlancePassword:
+        Fn::GetAtt: [ GlancePassword, Data ]
+    GlanceUser: {Ref: GlanceUser}