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 a748649..1e15511 100644 (file)
--- a/swift-deploy.yaml
+++ b/swift-deploy.yaml
@@ -5,15 +5,23 @@ 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
-  SwiftPartPower:
-    default: 10
-    description: Partition Power to use when building Swift rings
-    type: number
   SwiftReplicas:
     type: number
     default: 1
@@ -27,6 +35,7 @@ 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:
@@ -57,3 +66,4 @@ resources:
                         - - {get_attr: [controller0, networks, ctlplane, 0]}
                           - ':11211'
         swift_replicas: { get_param: SwiftReplicas}
+        swift_min_part_hours: { get_param: SwiftMinPartHours}