From 8a99e7d461f211f43751d5c72c8dbc5d1ae05ead Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Mon, 11 Aug 2014 09:18:01 +1200
Subject: 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
---
 swift-deploy.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'swift-deploy.yaml')

diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index eaa01317..239a4d48 100644
--- 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'
-- 
cgit 1.2.3-korg