Adding username/password for Nova in notcompute.

diff --git a/mysql.yaml b/mysql.yaml
index 4949b51..db051a2 100644 (file)
--- a/mysql.yaml
+++ b/mysql.yaml
@@ -21,6 +21,10 @@ Parameters:
     Description: Glance database username.
     Type: String
     Default: heat
+  NovaUser:
+    Description: Glance database username.
+    Type: String
+    Default: heat
   MySQLImage:
     Type: String
   BootstrapHost:
@@ -73,6 +77,9 @@ Resources:
           - database: glance
             username: {Ref: GlanceUser}
             userhandle: {Ref: GlancePasswordHandle}
+          - database: nova
+            username: {Ref: NovaUser}
+            userhandle: {Ref: NovaPasswordHandle}
       mysql-migration:
         users:
           root:
@@ -99,6 +106,14 @@ Resources:
         {Ref: MySQLImage}
       InstanceType: {Ref: InstanceType}
       KeyName: {Ref: KeyName}
+  NovaPasswordHandle:
+    Type: AWS::CloudFormation::WaitConditionHandle
+  NovaPassword:
+    DependsOn: MySQL
+    Type: AWS::CloudFormation::WaitCondition
+    Properties:
+      Handle: {Ref: NovaPasswordHandle}
+      Timeout: 90
   GlancePasswordHandle:
     Type: AWS::CloudFormation::WaitConditionHandle
   GlancePassword:
@@ -135,3 +150,6 @@ Outputs:
     GlancePassword:
         Fn::GetAtt: [ GlancePassword, Data ]
     GlanceUser: {Ref: GlanceUser}
+    NovaPassword:
+        Fn::GetAtt: [ NovaPassword, Data ]
+    NovaUser: {Ref: NovaUser}

diff --git a/notcompute.yaml b/notcompute.yaml
index 19a4785..a5c0cb4 100644 (file)
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -24,6 +24,12 @@ Outputs:
     Fn::GetAtt:
     - notcompute
     - PrivateIp
+  NovaPassword:
+    Fn::GetAtt:
+    - NovaPassword
+    - Data
+  NovaUser:
+    Ref: NovaUser
   RabbitMQHost:
     Fn::GetAtt:
     - notcompute
@@ -89,6 +95,10 @@ Parameters:
   NovaInterfaces:
     Default: eth0
     Type: String
+  NovaUser:
+    Default: heat
+    Description: Glance database username.
+    Type: String
   QuantumDSN:
     Description: DSN for connecting to quantum database
     Type: String
@@ -181,6 +191,15 @@ Resources:
     Type: AWS::CloudFormation::WaitCondition
   KeystonePasswordHandle:
     Type: AWS::CloudFormation::WaitConditionHandle
+  NovaPassword:
+    DependsOn: notcompute
+    Properties:
+      Handle:
+        Ref: NovaPasswordHandle
+      Timeout: 90
+    Type: AWS::CloudFormation::WaitCondition
+  NovaPasswordHandle:
+    Type: AWS::CloudFormation::WaitConditionHandle
   RabbitMQPassword:
     DependsOn: notcompute
     Properties:
@@ -298,6 +317,11 @@ Resources:
             Ref: GlancePasswordHandle
           username:
             Ref: GlanceUser
+        - database: nova
+          userhandle:
+            Ref: NovaPasswordHandle
+          username:
+            Ref: NovaUser
       mysql-migration:
         bootstrap_host:
           Ref: BootstrapHost