aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2014-08-13 12:02:52 +1200
committerRobert Collins <rbtcollins@hp.com>2014-08-13 12:12:58 +1200
commita7480472f7efb134108023c44276b52544efbd47 (patch)
tree5a8ea7c201a798bd42cc83c487e16e967f2525ba
parent5d35e97cfa2ac14ac91e2b9038a11e94606c0816 (diff)
Make Swift replica count configurable.
Using 1 is thoroughly non-HA :) This is the HOT version of this patch. Change-Id: Ic96bcdc03dacb9650520bd9ac1ce3805c6dac2fa implements: blueprint tripleo-icehouse-ha-production-configuration
-rw-r--r--swift-deploy.yaml5
-rw-r--r--swift-source.yaml2
-rw-r--r--swift-storage-source.yaml5
3 files changed, 11 insertions, 1 deletions
diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index eaa01317..c4fd757b 100644
--- a/swift-deploy.yaml
+++ b/swift-deploy.yaml
@@ -10,6 +10,10 @@ parameters:
description: The password for the swift service account, used by the swift proxy services.
type: string
hidden: true
+ SwiftReplicas:
+ type: number
+ default: 1
+ description: How many replicas to use in the swift rings.
resources:
controller0Swift:
type: OS::Heat::StructuredDeployment
@@ -47,3 +51,4 @@ resources:
- ''
- - {get_attr: [controller0, networks, ctlplane, 0]}
- ':11211'
+ swift_replicas: { get_param: SwiftReplicas}
diff --git a/swift-source.yaml b/swift-source.yaml
index 9c7b04f5..1a5a04f4 100644
--- a/swift-source.yaml
+++ b/swift-source.yaml
@@ -9,7 +9,7 @@ resources:
hash: { get_input: swift_hash_suffix }
part-power: 10
proxy-memcache: { get_input: swift_proxy_memcache }
- replicas: 1
+ replicas: {get_input: swift_replicas }
service-password: { get_input: swift_password }
neutron:
ovs:
diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index fbedb0bf..224e7712 100644
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -4,6 +4,10 @@ parameters:
SwiftStorageImage:
type: string
default: overcloud-swift-storage
+ SwiftReplicas:
+ type: number
+ default: 1
+ description: How many replicas to use in the swift rings.
OvercloudSwiftStorageFlavor:
default: baremetal
description: Flavor for Swift storage nodes to request when deploying.
@@ -75,3 +79,4 @@ resources:
- ''
- - {get_attr: [controller0, networks, ctlplane, 0]}
- ':11211'
+ swift_replicas: { get_param: SwiftReplicas}