diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-26 11:35:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-26 11:35:34 +0000 |
| commit | 1c7e2c8cd7051398c32a4c9fbd74b90a1e193c59 (patch) | |
| tree | 5e8ab6509e3601b3860db0e0c8b5bd1770019326 | |
| parent | 59e97e4ae0f02069dbcf6f675337cc11bd0d6076 (diff) | |
| parent | a7480472f7efb134108023c44276b52544efbd47 (diff) | |
Merge "Make Swift replica count configurable."
| -rw-r--r-- | swift-deploy.yaml | 5 | ||||
| -rw-r--r-- | swift-source.yaml | 2 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/swift-deploy.yaml b/swift-deploy.yaml index 239a4d48..e3f475c0 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 3dbdda95..40e0573b 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} |