Switch to heat_template_version: 2013-05-23

To support underclouds and seeds running older than the very
latest heat.

2013-05-23 lacks function list_join, so this change reverts to
using the equivalent function Fn::Join.

Change-Id: I039f57ab39c1fcfc319a7a34265ba4fabf4ccd08
Closes-Bug: #1354305

diff --git a/base.yaml b/base.yaml
index 43ce7e6..9c2e4e2 100644 (file)
--- a/base.yaml
+++ b/base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 description: 'Tie OpenStack components together'
 parameters:
   TemplateRoot:
@@ -12,7 +12,7 @@ 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 ] }
           - '@'

diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml
index 8b281dd..4947316 100644 (file)
--- a/block-storage-nfs.yaml
+++ b/block-storage-nfs.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 description: 'Common Block Storage Configuration'
 parameters:
   BlockStorageImage:
@@ -52,13 +52,13 @@ resources:
       keystone:
         host: {get_attr: [controller0, networks, ctlplane, 0]}
       cinder:
-        db: {list_join: ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]}
+        db: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]}
         volume_size_mb: '5000'
         service-password:
           get_param: CinderPassword
         include_nfs_backend: 'true'
         nfs_shares:
-          - {list_join: ['', [{get_attr: [controller0, networks, ctlplane, 0]} , ':/mnt/state/var/lib/nfs_share']]}
+          - {"Fn::Join": ['', [{get_attr: [controller0, networks, ctlplane, 0]} , ':/mnt/state/var/lib/nfs_share']]}
       admin-password: {get_param: AdminPassword}
       rabbit:
         host: {get_attr: [controller0, networks, ctlplane, 0]}

diff --git a/block-storage.yaml b/block-storage.yaml
index bf539e2..22811d3 100644 (file)
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 description: 'Common Block Storage Configuration'
 parameters:
   BlockStorageImage:
@@ -30,7 +30,7 @@ resources:
       config: {get_resource: BlockStorageConfig}
       input_values:
         controller_host: {get_attr: [controller0, networks, ctlplane, 0]}
-        cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]}
+        cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]}
         neutron_local_ip: {get_attr: [BlockStorage0 , networks, ctlplane, 0]}
       signal_transport: NO_SIGNAL
   BlockStorageConfig:

diff --git a/controller.yaml b/controller.yaml
index 1b0cb54..8aac819 100644 (file)
--- a/controller.yaml
+++ b/controller.yaml
@@ -1,6 +1,6 @@
 description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
   server,Dedicated RabbitMQ Server
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 parameters:
   AdminToken:
     type: string
@@ -130,7 +130,7 @@ resources:
             password: {get_param: NeutronDBPassword}
       glance:
         db:
-          list_join:
+          Fn::Join:
             - ''
             - - 'mysql://glance:'
               - {get_param: GlanceDBPassword}
@@ -141,7 +141,7 @@ resources:
             get_param: GlanceLogFile
       heat:
         db:
-          list_join:
+          Fn::Join:
             - ''
             - - 'mysql://heat:'
               - {get_param: HeatDBPassword}
@@ -168,14 +168,14 @@ resources:
         host:
           '127.0.0.1'
         db:
-          list_join:
+          Fn::Join:
             - ''
             - - 'mysql://keystone:'
               - {get_param: KeystoneDBPassword}
               - '@127.0.0.1/keystone'
       nova:
         db:
-          list_join:
+          Fn::Join:
             - ''
             - - 'mysql://nova:'
               - {get_param: NovaDBPassword}
@@ -184,7 +184,7 @@ resources:
         host:
           '127.0.0.1'
         ovs_db:
-          list_join:
+          Fn::Join:
             - ''
             - - 'mysql://neutron:'
               - {get_param: NeutronDBPassword}

diff --git a/examples/source_hot.yaml b/examples/source_hot.yaml
index 7b47f2b..1531488 100644 (file)
--- a/examples/source_hot.yaml
+++ b/examples/source_hot.yaml
@@ -13,4 +13,4 @@ resources:
     Path: examples/lib_hot.yaml
     SubKey: resources.GenericB
     parameters:
-      ImportantValue: {list_join: [ '', ['one', 'two', 'three']]}
+      ImportantValue: {"Fn::Join": [ '', ['one', 'two', 'three']]}

diff --git a/nagios3.yaml b/nagios3.yaml
index 06cbb6a..1e0a461 100644 (file)
--- a/nagios3.yaml
+++ b/nagios3.yaml
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 description: Deploy Nagios
 parameters:
   adm_web_passwd:

diff --git a/nfs-server-source.yaml b/nfs-server-source.yaml
index 63a1502..8e32e96 100644 (file)
--- a/nfs-server-source.yaml
+++ b/nfs-server-source.yaml
@@ -7,7 +7,7 @@ resources:
         shares:
           Merge::Map:
             NovaCompute0:
-              list_join:
+              Fn::Join:
               - ' '
               - - get_attr:
                   - NovaCompute0
@@ -15,7 +15,7 @@ resources:
                   - ctlplane
                   - 0
             BlockStorage0:
-              list_join:
+              Fn::Join:
               - ' '
               - - get_attr:
                   - BlockStorage0

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 562d0ad..c5f4337 100644 (file)
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 description: 'Nova Compute'
 parameters:
   AdminPassword:

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 53a751d..6432baa 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -1,6 +1,6 @@
 description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
   server,Dedicated RabbitMQ Server,Group of Nova Computes
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 parameters:
   AdminPassword:
     default: unset
@@ -319,19 +319,19 @@ resources:
         GlanceHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
         RabbitHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
         NovaDSN:
-          list_join:
+          Fn::Join:
             - ''
             - - mysql://nova:unset@
               - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
               - /nova
         CeilometerDSN:
-          list_join:
+          Fn::Join:
             - ''
             - - mysql://ceilometer:unset@
               - *compute_database_host
               - /ceilometer
         NeutronDSN:
-          list_join:
+          Fn::Join:
             - ''
             - - mysql://neutron:unset@
               - *compute_database_host
@@ -394,7 +394,7 @@ resources:
             {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
         cinder:
           db:
-            list_join:
+            Fn::Join:
               - ''
               - - mysql://cinder:unset@
                 - *database_host
@@ -424,7 +424,7 @@ resources:
             host: {get_input: controller_virtual_ip}
           backend: swift
           db:
-            list_join:
+            Fn::Join:
               - ''
               - - mysql://glance:unset@
                 - *database_host
@@ -451,7 +451,7 @@ resources:
           admin_user: heat
           auth_encryption_key: unset___________
           db:
-            list_join:
+            Fn::Join:
               - ''
               - - mysql://heat:unset@
                 - *database_host
@@ -469,7 +469,7 @@ resources:
                     {get_attr: [controller0, show, name]}
         keystone:
           db:
-            list_join:
+            Fn::Join:
               - ''
               - - mysql://keystone:unset@
                 - *database_host
@@ -487,7 +487,7 @@ resources:
               controller0:
                 ip: {get_attr: [controller0, networks, ctlplane, 0]}
           cluster_name:
-            list_join:
+            Fn::Join:
               - '-'
               - - 'tripleo'
                 - {get_resource: MysqlClusterUniquePart}
@@ -509,7 +509,7 @@ resources:
             physical_bridge: br-ex
             tenant_network_type: gre
           ovs_db:
-            list_join:
+            Fn::Join:
               - ''
               - - mysql://neutron:unset@
                 - *database_host
@@ -520,7 +520,7 @@ resources:
             get_param: NeutronDnsmasqOptions
         ceilometer:
           db:
-            list_join:
+            Fn::Join:
               - ''
               - - mysql://ceilometer:unset@
                 - *database_host
@@ -537,7 +537,7 @@ resources:
         nova:
           compute_driver: libvirt.LibvirtDriver
           db:
-            list_join:
+            Fn::Join:
               - ''
               - - mysql://nova:unset@
                 - *database_host
@@ -700,19 +700,19 @@ resources:
         controller_virtual_ip:
           {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
         heat.watch_server_url:
-          list_join:
+          Fn::Join:
             - ''
             - - 'http://'
               - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
               - ':8003'
         heat.metadata_server_url:
-          list_join:
+          Fn::Join:
             - ''
             - - 'http://'
               - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
               - ':8000'
         heat.waitcondition_server_url:
-          list_join:
+          Fn::Join:
             - ''
             - - 'http://'
               - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
@@ -723,36 +723,36 @@ resources:
       config:
         completion-signal: {get_input: deploy_signal_id}
         hosts:
-          list_join:
+          Fn::Join:
           - "\n"
-          - - list_join:
+          - - Fn::Join:
               - "\n"
               - Merge::Map:
                   NovaCompute0:
-                    list_join:
+                    Fn::Join:
                     - ' '
                     - - {get_attr: [NovaCompute0, networks, ctlplane, 0]}
                       - {get_attr: [NovaCompute0, show, name]}
-                      - list_join:
+                      - Fn::Join:
                         - '.'
                         - - {get_attr: [NovaCompute0, show, name]}
                           - 'novalocal'
-            - list_join:
+            - Fn::Join:
               - "\n"
               - Merge::Map:
                   controller0:
-                    list_join:
+                    Fn::Join:
                     - ' '
                     - - {get_attr: [controller0, networks, ctlplane, 0]}
                       - {get_attr: [controller0, show, name]}
-                      - list_join:
+                      - Fn::Join:
                         - '.'
                         - - {get_attr: [controller0, show, name]}
                           - 'novalocal'
                       - {get_param: CloudName}
         rabbit:
           nodes:
-            list_join:
+            Fn::Join:
               - ','
               - Merge::Map:
                   controller0:
@@ -780,7 +780,7 @@ outputs:
   KeystoneURL:
     description: URL for the Overcloud Keystone service
     value:
-      list_join:
+      Fn::Join:
       - ''
       - - http://
         - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}

diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index eaa0131..239a4d4 100644 (file)
--- a/swift-deploy.yaml
+++ b/swift-deploy.yaml
@@ -21,29 +21,29 @@ resources:
         swift_hash_suffix: {get_param: SwiftHashSuffix}
         swift_password: {get_param: SwiftPassword}
         swift_devices:
-          list_join:
+          Fn::Join:
           - ', '
           - Merge::Map:
               controller0:
-                list_join:
+                Fn::Join:
                 - ''
                 - - 'r1z1-'
                   - {get_attr: [controller0, networks, ctlplane, 0]}
                   - ':%PORT%/d1'
               SwiftStorage0:
-                list_join:
+                Fn::Join:
                 - ''
                 - - 'r1z1-'
                   - {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
                   - ':%PORT%/d1'
         swift_proxy_memcache:
-          list_join:
+          Fn::Join:
             - ','
             - Merge::Map:
                 controller0:
-                  list_join:
+                  Fn::Join:
                     - ', '
-                    - - list_join:
+                    - - Fn::Join:
                         - ''
                         - - {get_attr: [controller0, networks, ctlplane, 0]}
                           - ':11211'

diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index fbedb0b..3dbdda9 100644 (file)
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 description: 'Common Swift Storage Configuration'
 parameters:
   SwiftStorageImage:
@@ -49,29 +49,29 @@ resources:
         swift_hash_suffix: {get_param: SwiftHashSuffix}
         swift_password: {get_param: SwiftPassword}
         swift_devices:
-          list_join:
+          Fn::Join:
           - ', '
           - Merge::Map:
               controller0:
-                list_join:
+                Fn::Join:
                 - ''
                 - - 'r1z1-'
                   - {get_attr: [controller0, networks, ctlplane, 0]}
                   - ':%PORT%/d1'
               SwiftStorage0:
-                list_join:
+                Fn::Join:
                 - ''
                 - - 'r1z1-'
                   - {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
                   - ':%PORT%/d1'
         swift_proxy_memcache:
-          list_join:
+          Fn::Join:
             - ','
             - Merge::Map:
                 controller0:
-                  list_join:
+                  Fn::Join:
                     - ', '
-                    - - list_join:
+                    - - Fn::Join:
                         - ''
                         - - {get_attr: [controller0, networks, ctlplane, 0]}
                           - ':11211'

diff --git a/tripleo_heat_merge/merge.py b/tripleo_heat_merge/merge.py
index 3549769..077bcb1 100644 (file)
--- a/tripleo_heat_merge/merge.py
+++ b/tripleo_heat_merge/merge.py
@@ -26,7 +26,7 @@ class Cfn(object):
 class Hot(object):
 
     base_template = {
-        'heat_template_version': '2014-10-16',
+        'heat_template_version': '2013-05-23',
         'description': []
     }
     get_resource = 'get_resource'

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index ef8d7cd..741d3ae 100644 (file)
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -1,5 +1,5 @@
 description: All-in-one baremetal OpenStack and all dependencies.
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 parameters:
   AdminPassword:
     default: unset
@@ -337,19 +337,19 @@ resources:
           - ctlplane
           - 0
         heat.watch_server_url:
-          list_join:
+          Fn::Join:
             - ''
             - - 'http://'
               - get_attr: [undercloud, networks, ctlplane, 0]
               - ':8003'
         heat.metadata_server_url:
-          list_join:
+          Fn::Join:
             - ''
             - - 'http://'
               - {get_attr: [undercloud, networks, ctlplane, 0]}
               - ':8000'
         heat.waitcondition_server_url:
-          list_join:
+          Fn::Join:
             - ''
             - - 'http://'
               - {get_attr: [undercloud, networks, ctlplane, 0]}