Match Metadata with tripleo-image-elements.

1 files changed, 28 insertions, 30 deletions

diff --git a/heat.yaml b/heat.yaml
index 351feae5..92f45744 100644
--- a/heat.yaml
+++ b/heat.yaml
@@ -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