diff options
author | 2015-01-09 20:29:16 +0000 | |
---|---|---|
committer | 2015-01-09 20:29:17 +0000 | |
commit | 5409182d65439fe81dfac0fb4c4703312333735e (patch) | |
tree | 7adfd996cd902f7fb9c66ac73f7193817b4618d0 | |
parent | 17e5760f8499c3d4851f308ae66b0b995629e192 (diff) | |
parent | a471fee05a27dcf9ecb9355a6baaa43e6507e8c2 (diff) |
Merge "Add SwiftMinPartHours to overcloud-without-mergepy"
-rw-r--r-- | controller.yaml | 6 | ||||
-rw-r--r-- | overcloud-without-mergepy.yaml | 6 | ||||
-rw-r--r-- | swift-storage.yaml | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml index 57b07718..214ffbb6 100644 --- a/controller.yaml +++ b/controller.yaml @@ -344,6 +344,10 @@ parameters: in the ring. hidden: true type: string + 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 @@ -619,6 +623,7 @@ resources: swift: hash: { get_input: swift_hash_suffix } part-power: { get_input: swift_part_power } + min-part-hours: { get_input: swift_min_part_hours } replicas: {get_input: swift_replicas } service-password: { get_input: swift_password } @@ -631,6 +636,7 @@ resources: input_values: swift_hash_suffix: {get_param: SwiftHashSuffix} swift_password: {get_param: SwiftPassword} + swift_min_part_hours: {get_param: SwiftMinPartHours} swift_part_power: {get_param: SwiftPartPower} swift_replicas: { get_param: SwiftReplicas} diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index d2bf5bca..45cedc57 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -370,6 +370,10 @@ parameters: description: The password for the swift service account, used by the swift proxy services. type: string hidden: true + 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 @@ -525,6 +529,7 @@ resources: SSLKey: {get_param: SSLKey} SSLCACertificate: {get_param: SSLCACertificate} SwiftHashSuffix: {get_param: SwiftHashSuffix} + SwiftMinPartHours: {get_param: SwiftMinPartHours} SwiftPartPower: {get_param: SwiftPartPower} SwiftPassword: {get_param: SwiftPassword} SwiftReplicas: { get_param: SwiftReplicas} @@ -611,6 +616,7 @@ resources: NeutronNetworkType: {get_param: NeutronNetworkType} Flavor: {get_param: OvercloudSwiftStorageFlavor} HashSuffix: {get_param: SwiftHashSuffix} + MinPartHours: {get_param: SwiftMinPartHours} PartPower: {get_param: SwiftPartPower} Password: {get_param: SwiftPassword} Image: {get_param: SwiftStorageImage} diff --git a/swift-storage.yaml b/swift-storage.yaml index ea032b96..7522083f 100644 --- a/swift-storage.yaml +++ b/swift-storage.yaml @@ -70,6 +70,10 @@ parameters: NeutronNetworkType: default: gre type: string + MinPartHours: + type: number + default: 1 + description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance. PartPower: default: 10 description: Partition Power to use when building Swift rings @@ -107,6 +111,7 @@ resources: swift: hash: { get_input: swift_hash_suffix } part-power: { get_input: swift_part_power } + min-part-hours: { get_input: swift_min_part_hours } replicas: {get_input: swift_replicas } service-password: { get_input: swift_password } neutron: @@ -150,6 +155,7 @@ resources: swift_hash_suffix: {get_param: HashSuffix} swift_mount_check: {get_param: MountCheck} swift_password: {get_param: Password} + swift_min_part_hours: {get_param: MinPartHours} swift_part_power: {get_param: PartPower} swift_replicas: { get_param: Replicas} |