Define and bind a public virtual IP

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

diff --git a/base.yaml b/base.yaml
index 6db5d3e..f1e8967 100644 (file)
--- a/base.yaml
+++ b/base.yaml
@@ -1,9 +1,13 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Tie OpenStack components together'
+Description: 'Tie OpenStack components together'
 Parameters:
   TemplateRoot:
     Description: URL Base where all of our templates are available
     Type: String
+  KeystoneAdminToken:
+    Description: Admin Token needed for keystone
+    Type: String
+    NoEcho: true
 Resources:
   RabbitMQ:
     Type: AWS::CloudFormation::Stack
@@ -32,14 +36,30 @@ Resources:
         - {Ref: TemplateRoot}
         - keystone.yaml
     Parameters:
+      AdminToken: {Ref: KeystoneAdminToken}
       KeyName: default
       KeystoneDSN:
         Fn::Join:
           - 'mysql://keystone:'
-          - {Fn::GetAtt: [ MySQL , KeystonePassword ]}
+          - {"Fn::GetAtt": [ MySQL , KeystonePassword ]}
           - '@'
-          - {Fn::GetAtt: [ MySQL , MySQLHost ]}
+          - {"Fn::GetAtt": [ MySQL , MySQLHost ]}
           - '/keystone'
+  Glance:
+    Type: AWS::CloudFormation::Stack
+    TemplateURL:
+      Fn::Join:
+        - {Ref: TemplateRoot}
+        - glance.yaml
+    Parameters:
+      KeyName: default
+      HeatDSN:
+        Fn::Join:
+          - 'mysql://glance:'
+          - {"Fn::GetAtt": [ MySQL, GlancePassword ] }
+          - '@'
+          - {"Fn::GetAtt": [ MySQL, MySQLHost ]}
+          - '/glance'
   Heat:
     Type: AWS::CloudFormation::Stack
     TemplateURL:
@@ -51,7 +71,7 @@ Resources:
       HeatDSN:
         Fn::Join:
           - 'mysql://heat:'
-          - {Fn::GetAtt: [ MySQL, HeatPassword ] }
+          - {"Fn::GetAtt": [ MySQL, HeatPassword ] }
           - '@'
-          - {Fn::GetAtt: [ MySQL, MySQLHost ]}
+          - {"Fn::GetAtt": [ MySQL, MySQLHost ]}
           - '/heat'