Match Metadata with tripleo-image-elements.

diff --git a/base.yaml b/base.yaml
index 6db5d3e..f05664e 100644 (file)
--- a/base.yaml
+++ b/base.yaml
@@ -4,6 +4,9 @@ Parameters:
   TemplateRoot:
     Description: URL Base where all of our templates are available
     Type: String
+  KeystoneAdminToken:
+    Description: Admin Token needed for keystone
+    Type: String
 Resources:
   RabbitMQ:
     Type: AWS::CloudFormation::Stack
@@ -32,6 +35,7 @@ Resources:
         - {Ref: TemplateRoot}
         - keystone.yaml
     Parameters:
+      AdminToken: {Ref: KeystoneAdminToken}
       KeyName: default
       KeystoneDSN:
         Fn::Join:

diff --git a/heat.yaml b/heat.yaml
index 351feae..92f4574 100644 (file)
--- 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

diff --git a/keystone.yaml b/keystone.yaml
index b17397a..5c55c11 100644 (file)
--- a/keystone.yaml
+++ b/keystone.yaml
@@ -14,6 +14,8 @@ Parameters:
     Type: String
   KeystoneImage:
     Type: String
+  AdminToken:
+    Type: String
 Resources:
   ApiAccessPolicy:
     Type: OS::Heat::AccessPolicy
@@ -36,15 +38,20 @@ Resources:
       InstanceType: {Ref: InstanceType}
       KeyName: {Ref: KeyName}
     Metadata:
-      OpenStack::Heat::CFNTools:
-        AWSAccessKeyId:
+      OpenStack::ImageBuilder::Elements: [ keystone ]
+      heat: 
+        access_key_id:
           Ref: ApiKey
-        AWSSecretAccessKey:
+        secret_key:
           Fn::GetAtt: [ ApiKey, SecretAccessKey ]
-      OpenStack::ImageBuilder::Elements: [ keystone ]
-      OpenStack:
-        keystone:
-          db: {Ref: KeystoneDSN}
+        stack:
+          name: {Ref: 'AWS::StackName'}
+          region: {Ref: 'AWS::Region'}
+        refresh:
+          - resource: Keystone
+      admin-token: {Ref: AdminToken}
+      keystone:
+        db: {Ref: KeystoneDSN}
   Keystone:
     Type: OS::Heat::InstanceGroup
     Properties:

diff --git a/mysql.yaml b/mysql.yaml
index 1f7e8da..cd472f1 100644 (file)
--- a/mysql.yaml
+++ b/mysql.yaml
@@ -57,36 +57,35 @@ Resources:
     Type: AWS::EC2::Instance
     Metadata:
       OpenStack::ImageBuilder::Elements: [ mysql-migration ]
-      OpenStack::Config:
-        mysql:
-          create-users:
-            - database: keystone
-              username: {Ref: KeystoneUser}
-              userhandle: {Ref: KeystonePasswordHandle}
-            - database: heat
-              username: {Ref: HeatUser}
-              userhandle: {Ref: HeatPasswordHandle}
-        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
+      mysql:
+        create-users:
+          - database: keystone
+            username: {Ref: KeystoneUser}
+            userhandle: {Ref: KeystonePasswordHandle}
+          - database: heat
+            username: {Ref: HeatUser}
+            userhandle: {Ref: HeatPasswordHandle}
+      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}

diff --git a/rabbitmq.yaml b/rabbitmq.yaml
index 3b37bf4..e00f603 100644 (file)
--- a/rabbitmq.yaml
+++ b/rabbitmq.yaml
@@ -16,9 +16,8 @@ Resources:
     Type: AWS::EC2::Instance
     Metadata:
       OpenStack::ImageBuilder::Elements: [ rabbitmq-server ]
-      OpenStack::Config:
-        rabbitmq:
-          password_handle: {Ref: RabbitMQPasswordHandle}
+      rabbitmq:
+        password_handle: {Ref: RabbitMQPasswordHandle}
     Properties:
       ImageId:
         {Ref: RabbitMQImage}