summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorcan <lorcan.browne@hp.com>2014-09-12 13:40:24 +0100
committerLorcan <lorcan.browne@hp.com>2014-09-29 10:22:28 +0100
commit24a45cb0defe997b32e8379ae9d6d313547ed9e5 (patch)
treee9c5cbfaf871befd5761abd683ace8df302bd8c7
parent218bd3cad53aef9b9890bc3119a4280c7e54806e (diff)
Add SwiftMinPartHours parameter
This parameter adds the facility for an operator to set the length of time in hours that a partition in a swift ring can be altered following a rebalance of that ring. The default value is set to one. The corresponding element change is here: Ie6438386a54794e1ae2f31ad925db01c2c10ed6d Change-Id: Icc5e431a7e2884b3ca3a255b6fd901619bc98460
-rw-r--r--swift-deploy.yaml5
-rw-r--r--swift-source.yaml1
-rw-r--r--swift-storage-source.yaml1
3 files changed, 7 insertions, 0 deletions
diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index e3f475c0..4a8625ee 100644
--- a/swift-deploy.yaml
+++ b/swift-deploy.yaml
@@ -14,6 +14,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
@@ -52,3 +56,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 cf1cf9dc..b07164c8 100644
--- a/swift-source.yaml
+++ b/swift-source.yaml
@@ -10,4 +10,5 @@ resources:
part-power: 10
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 103a7ec7..d3653426 100644
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -71,3 +71,4 @@ resources:
- - {get_attr: [controller0, networks, ctlplane, 0]}
- ':11211'
swift_replicas: { get_param: SwiftReplicas}
+ swift_min_part_hours: { get_param: SwiftMinPartHours}