diff options
author | Clint Byrum <clint@fewbar.com> | 2013-04-18 14:04:06 -0700 |
---|---|---|
committer | Clint Byrum <clint@fewbar.com> | 2013-04-18 14:04:06 -0700 |
commit | 41fb3c49045fd5dc6ae3ec013c51e8b8428d1fff (patch) | |
tree | fc4970ad2a2f1abdb86f81c4cb6aeba40f1c748e /heat.yaml | |
parent | 9954c0f5b2fda18757c2bcb5240c4b19da7dc69e (diff) |
Match Metadata with tripleo-image-elements.
Diffstat (limited to 'heat.yaml')
-rw-r--r-- | heat.yaml | 58 |
1 files changed, 28 insertions, 30 deletions
@@ -61,21 +61,20 @@ Resources: Type: AWS::AutoScaling::LaunchConfiguration Metadata: OpenStack::ImageBuilder::Elements: [ heat-api ] - OpenStack::Config: - heat: - rpc_backend: heat.openstack.common.rpc.impl_kombu - rabbit: - host: {Ref: RabbitMQHost} - password: {Ref: RabbitMQPassword} - access_key_id: - Ref: ApiKey - secret_key: - Fn::GetAtt: [ ApiKey, SecretAccessKey ] - stack: - name: {Ref: 'AWS::StackName'} - region: {Ref: 'AWS::Region'} - refresh: - - resource: HeatAPILaunch + heat: + rpc_backend: heat.openstack.common.rpc.impl_kombu + rabbit: + host: {Ref: RabbitMQHost} + password: {Ref: RabbitMQPassword} + access_key_id: + Ref: ApiKey + secret_key: + Fn::GetAtt: [ ApiKey, SecretAccessKey ] + stack: + name: {Ref: 'AWS::StackName'} + region: {Ref: 'AWS::Region'} + refresh: + - resource: HeatAPILaunch Properties: ImageId: {Ref: HeatApiImage} @@ -94,18 +93,17 @@ Resources: ImageId: {Ref: HeatEngineImage} Metadata: - OpenStack::Config: - heat: - rpc_backend: heat.openstack.common.rpc.impl_kombu - rabbit: - host: {Ref: RabbitMQHost} - password: {Ref: RabbitMQPassword} - access_key_id: - Ref: EngineKey - secret_key: - Fn::GetAtt: [ EngineKey, SecretAccessKey ] - stack: - name: {Ref: 'AWS::StackName'} - region: {Ref: 'AWS::Region'} - refresh: - - resource: HeatEngine + heat: + rpc_backend: heat.openstack.common.rpc.impl_kombu + rabbit: + host: {Ref: RabbitMQHost} + password: {Ref: RabbitMQPassword} + access_key_id: + Ref: EngineKey + secret_key: + Fn::GetAtt: [ EngineKey, SecretAccessKey ] + stack: + name: {Ref: 'AWS::StackName'} + region: {Ref: 'AWS::Region'} + refresh: + - resource: HeatEngine |