diff options
| author |   Clint Byrum <clint@fewbar.com> | 2013-05-14 12:15:55 -0700 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2013-06-06 09:33:29 -0700 |
| commit | f3760660331a188c486c9643896e6458ebc4c455 (patch) | |
| tree | 6fdbd8045e23327590c1ac386d0262162f65b4d0 | |
| parent | 862bd3626bc375354d016196f57860a5216ba7fd (diff) | |
Adding username/password for Nova in notcompute.
| -rw-r--r-- | mysql.yaml | 18 | ||||
| -rw-r--r-- | notcompute.yaml | 24 |
2 files changed, 42 insertions, 0 deletions
@@ -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 19a47853..a5c0cb4f 100644 --- 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 |