X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=base.yaml;h=f1e8967d38e3d1e3ffa2fd7a05151e5ebf0416c5;hb=c89f6e26e95eb3e8aac4e3efbfa4e8263fae0ec0;hp=adff04ed7801c38b43390afce4e3c4705b2823a9;hpb=a6e6afaa5a0bb98ce7862fcdae197357c127203d;p=apex-tripleo-heat-templates.git

diff --git a/base.yaml b/base.yaml
index adff04ed..f1e8967d 100644
--- a/base.yaml
+++ b/base.yaml
@@ -1,10 +1,24 @@
 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
+    TemplateURL:
+      Fn::Join:
+        - {Ref: TemplateRoot}
+        - rabbitmq.yaml
+    Parameters:
+      InstanceType: m1.small
+      KeyName: default
+      RabbitMQImage: image-rabbitmq
   MySQL:
     Type: AWS::CloudFormation::Stack
     TemplateURL:
@@ -22,11 +36,42 @@ 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:
+      Fn::Join:
+        - {Ref: TemplateRoot}
+        - heat.yaml
+    Parameters:
+      KeyName: default
+      HeatDSN:
+        Fn::Join:
+          - 'mysql://heat:'
+          - {"Fn::GetAtt": [ MySQL, HeatPassword ] }
+          - '@'
+          - {"Fn::GetAtt": [ MySQL, MySQLHost ]}
+          - '/heat'