Merge "Add parameter to manage usage of Neutron l3_ha option"

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

diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index 2da242e..1e15511 100644 (file)
--- a/swift-deploy.yaml
+++ b/swift-deploy.yaml
@@ -5,11 +5,27 @@ parameters:
     description: A random string to be used as a salt when hashing to determine mappings in the ring.
     type: string
     hidden: true
+  SwiftMountCheck:
+    default: 'false'
+    description: Value of mount_check in Swift account/container/object -server.conf
+    type: boolean
+  SwiftMinPartHours:
+    type: number
+    default: 1
+    description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance.
+  SwiftPartPower:
+    default: 10
+    description: Partition Power to use when building Swift rings
+    type: number
   SwiftPassword:
     default: unset
     description: The password for the swift service account, used by the swift proxy services.
     type: string
     hidden: true
+  SwiftReplicas:
+    type: number
+    default: 1
+    description: How many replicas to use in the swift rings.
 resources:
   controller0Swift:
     type: OS::Heat::StructuredDeployment
@@ -19,37 +35,35 @@ resources:
       signal_transport: NO_SIGNAL
       input_values:
         swift_hash_suffix: {get_param: SwiftHashSuffix}
+        swift_mount_check: {get_param: SwiftMountCheck}
         swift_password: {get_param: SwiftPassword}
+        swift_part_power: {get_param: SwiftPartPower}
         swift_devices:
-          list_join:
+          Fn::Join:
           - ', '
           - Merge::Map:
               controller0:
-                list_join:
+                Fn::Join:
                 - ''
                 - - 'r1z1-'
-                  - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] }
+                  - {get_attr: [controller0, networks, ctlplane, 0]}
                   - ':%PORT%/d1'
               SwiftStorage0:
-                list_join:
+                Fn::Join:
                 - ''
                 - - 'r1z1-'
-                  - Fn::Select:
-                    - 0
-                    - Fn::Select:
-                      - 'ctlplane'
-                      - get_attr:
-                        - SwiftStorage0
-                        - networks
+                  - {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:
                         - ''
-                        - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] }
+                        - - {get_attr: [controller0, networks, ctlplane, 0]}
                           - ':11211'
+        swift_replicas: { get_param: SwiftReplicas}
+        swift_min_part_hours: { get_param: SwiftMinPartHours}