Merge "Fix spelling of controller0_VLANPort"

[apex-tripleo-heat-templates.git] / swift-storage-source.yaml

diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index fbedb0b..103a7ec 100644 (file)
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -1,19 +1,17 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 description: 'Common Swift Storage Configuration'
 parameters:
   SwiftStorageImage:
     type: string
     default: overcloud-swift-storage
+  SwiftReplicas:
+    type: number
+    default: 1
+    description: How many replicas to use in the swift rings.
   OvercloudSwiftStorageFlavor:
     default: baremetal
     description: Flavor for Swift storage nodes to request when deploying.
     type: string
-  NeutronNetworkType:
-    type: string
-    default: 'gre'
-  NeutronEnableTunnelling:
-    type: string
-    default: True
 resources:
   SwiftStorage0:
     type: OS::Nova::Server
@@ -43,35 +41,33 @@ resources:
       config: {get_resource: SwiftConfig}
       signal_transport: NO_SIGNAL
       input_values:
-        neutron_local_ip: {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
-        neutron_tenant_network_type: {get_param: NeutronNetworkType}
-        neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
         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'
+        swift_replicas: { get_param: SwiftReplicas}