Merge "Secure the MySQL bind-address on the undercloud"

[apex-tripleo-heat-templates.git] / base.yaml

diff --git a/base.yaml b/base.yaml
index f05664e..a1ba509 100644 (file)
--- a/base.yaml
+++ b/base.yaml
@@ -1,61 +1,77 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Tie OpenStack components together'
-Parameters:
-  TemplateRoot:
-    Description: URL Base where all of our templates are available
-    Type: String
+heat_template_version: 2013-05-23
+description: 'Tie OpenStack components together'
+parameters:
   KeystoneAdminToken:
-    Description: Admin Token needed for keystone
-    Type: String
-Resources:
+    description: Admin Token needed for keystone
+    type: string
+    hidden: true
+  TemplateRoot:
+    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:
-      AdminToken: {Ref: KeystoneAdminToken}
+    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'