diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-10-07 20:50:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-10-07 20:50:59 +0000 |
| commit | a35679f539614846f43dbb0b5a3c57dc7e0f34ee (patch) | |
| tree | 7844912bb2c3984d8c6b7682852b34153d1079c4 | |
| parent | 7d703cb7e79d9f7326c9c66c15c2fd0dd3735687 (diff) | |
| parent | 24a45cb0defe997b32e8379ae9d6d313547ed9e5 (diff) | |
Merge "Add SwiftMinPartHours parameter"
| -rw-r--r-- | swift-deploy.yaml | 5 | ||||
| -rw-r--r-- | swift-source.yaml | 1 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/swift-deploy.yaml b/swift-deploy.yaml index a7486490..803861ee 100644 --- a/swift-deploy.yaml +++ b/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} diff --git a/swift-source.yaml b/swift-source.yaml index ca0967a4..815ca7f5 100644 --- a/swift-source.yaml +++ b/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 } diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index 48154e23..31addaff 100644 --- a/swift-storage-source.yaml +++ b/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} |