Big Switch Neutron ML2 plugin integration

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

diff --git a/base.yaml b/base.yaml
index 43ce7e6..a1ba509 100644 (file)
--- a/base.yaml
+++ b/base.yaml
@@ -1,18 +1,18 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 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
     hidden: true
+  TemplateRoot:
+    description: URL Base where all of our templates are available
+    type: string
 resources:
   RabbitMQ:
     type: AWS::CloudFormation::Stack
     TemplateURL:
-      list_join:
+      Fn::Join:
         - {get_param: TemplateRoot}
         - rabbitmq.yaml
     parameters:
@@ -22,7 +22,7 @@ resources:
   MySQL:
     type: AWS::CloudFormation::Stack
     TemplateURL:
-      list_join:
+      Fn::Join:
         - {get_param: TemplateRoot}
         - mysql.yaml
     parameters:
@@ -32,14 +32,14 @@ resources:
   Keystone:
     type: AWS::CloudFormation::Stack
     TemplateURL:
-      list_join:
+      Fn::Join:
         - {get_param: TemplateRoot}
         - keystone.yaml
     parameters:
       AdminToken: {get_param: KeystoneAdminToken}
       KeyName: default
       KeystoneDSN:
-        list_join:
+        Fn::Join:
           - 'mysql://keystone:'
           - {get_attr: [ MySQL , KeystonePassword ]}
           - '@'
@@ -48,13 +48,13 @@ resources:
   Glance:
     type: AWS::CloudFormation::Stack
     TemplateURL:
-      list_join:
+      Fn::Join:
         - {get_param: TemplateRoot}
         - glance.yaml
     parameters:
       KeyName: default
       HeatDSN:
-        list_join:
+        Fn::Join:
           - 'mysql://glance:'
           - {get_attr: [ MySQL, GlancePassword ] }
           - '@'
@@ -63,13 +63,13 @@ resources:
   Heat:
     type: AWS::CloudFormation::Stack
     TemplateURL:
-      list_join:
+      Fn::Join:
         - {get_param: TemplateRoot}
         - heat.yaml
     parameters:
       KeyName: default
       HeatDSN:
-        list_join:
+        Fn::Join:
           - 'mysql://heat:'
           - {get_attr: [ MySQL, HeatPassword ] }
           - '@'