diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-01-09 20:29:16 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-01-09 20:29:17 +0000 |
commit | 5409182d65439fe81dfac0fb4c4703312333735e (patch) | |
tree | 7adfd996cd902f7fb9c66ac73f7193817b4618d0 /overcloud-without-mergepy.yaml | |
parent | 17e5760f8499c3d4851f308ae66b0b995629e192 (diff) | |
parent | a471fee05a27dcf9ecb9355a6baaa43e6507e8c2 (diff) |
Merge "Add SwiftMinPartHours to overcloud-without-mergepy"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
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} |