X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=base.yaml;h=a1ba509f2a589ffa73b244805f7c5a3f89a3ce8f;hb=737185abf14d5ba0beb1f24b48c1b9abfa90ebc4;hp=6db5d3ed588f8800b13adbfaf8c2f704b9a161ee;hpb=9954c0f5b2fda18757c2bcb5240c4b19da7dc69e;p=apex-tripleo-heat-templates.git

diff --git a/base.yaml b/base.yaml
index 6db5d3ed..a1ba509f 100644
--- a/base.yaml
+++ b/base.yaml
@@ -1,57 +1,77 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Tie OpenStack components together'
-Parameters:
+heat_template_version: 2013-05-23
+description: 'Tie OpenStack components together'
+parameters:
+  KeystoneAdminToken:
+    description: Admin Token needed for keystone
+    type: string
+    hidden: true
   TemplateRoot:
-    Description: URL Base where all of our templates are available
-    Type: String
-Resources:
+    description: URL Base where all of our templates are available
+    type: string
+resources:
   RabbitMQ:
-    Type: AWS::CloudFormation::Stack
+    type: AWS::CloudFormation::Stack
     TemplateURL:
       Fn::Join:
-        - {Ref: TemplateRoot}
+        - {get_param: TemplateRoot}
         - rabbitmq.yaml
-    Parameters:
+    parameters:
       InstanceType: m1.small
       KeyName: default
       RabbitMQImage: image-rabbitmq
   MySQL:
-    Type: AWS::CloudFormation::Stack
+    type: AWS::CloudFormation::Stack
     TemplateURL:
       Fn::Join:
-        - {Ref: TemplateRoot}
+        - {get_param: TemplateRoot}
         - mysql.yaml
-    Parameters:
+    parameters:
       InstanceType: m1.small
       KeyName: default
       MySQLImage: image-mysql
   Keystone:
-    Type: AWS::CloudFormation::Stack
+    type: AWS::CloudFormation::Stack
     TemplateURL:
       Fn::Join:
-        - {Ref: TemplateRoot}
+        - {get_param: TemplateRoot}
         - keystone.yaml
-    Parameters:
+    parameters:
+      AdminToken: {get_param: KeystoneAdminToken}
       KeyName: default
       KeystoneDSN:
         Fn::Join:
           - 'mysql://keystone:'
-          - {Fn::GetAtt: [ MySQL , KeystonePassword ]}
+          - {get_attr: [ MySQL , KeystonePassword ]}
           - '@'
-          - {Fn::GetAtt: [ MySQL , MySQLHost ]}
+          - {get_attr: [ MySQL , MySQLHost ]}
           - '/keystone'
+  Glance:
+    type: AWS::CloudFormation::Stack
+    TemplateURL:
+      Fn::Join:
+        - {get_param: TemplateRoot}
+        - glance.yaml
+    parameters:
+      KeyName: default
+      HeatDSN:
+        Fn::Join:
+          - 'mysql://glance:'
+          - {get_attr: [ MySQL, GlancePassword ] }
+          - '@'
+          - {get_attr: [ MySQL, MySQLHost ]}
+          - '/glance'
   Heat:
-    Type: AWS::CloudFormation::Stack
+    type: AWS::CloudFormation::Stack
     TemplateURL:
       Fn::Join:
-        - {Ref: TemplateRoot}
+        - {get_param: TemplateRoot}
         - heat.yaml
-    Parameters:
+    parameters:
       KeyName: default
       HeatDSN:
         Fn::Join:
           - 'mysql://heat:'
-          - {Fn::GetAtt: [ MySQL, HeatPassword ] }
+          - {get_attr: [ MySQL, HeatPassword ] }
           - '@'
-          - {Fn::GetAtt: [ MySQL, MySQLHost ]}
+          - {get_attr: [ MySQL, MySQLHost ]}
           - '/heat'