Merge "Add SwiftMinPartHours parameter"

swift-deploy.yaml

@@ -18,6 +18,10 @@ parameters:
     type: number
     default: 1
     description: How many replicas to use in the swift rings.
+  SwiftMinPartHours:
+    type: number
+    default: 1
+    description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance.
 resources:
   controller0Swift:
     type: OS::Heat::StructuredDeployment
@@ -57,3 +61,4 @@ resources:
                         - - {get_attr: [controller0, networks, ctlplane, 0]}
                           - ':11211'
         swift_replicas: { get_param: SwiftReplicas}
+        swift_min_part_hours: { get_param: SwiftMinPartHours}

swift-source.yaml

@@ -10,4 +10,5 @@ resources:
           part-power: { get_input: swift_part_power }
           proxy-memcache: { get_input: swift_proxy_memcache }
           replicas: {get_input: swift_replicas }
+          min-part-hours: {get_input: swift_min_part_hours }
           service-password: { get_input: swift_password }

swift-storage-source.yaml

@@ -72,3 +72,4 @@ resources:
                         - - {get_attr: [controller0, networks, ctlplane, 0]}
                           - ':11211'
         swift_replicas: { get_param: SwiftReplicas}
+        swift_min_part_hours: { get_param: SwiftMinPartHours}