From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 16 Sep 2014 09:15:26 +0000 (+0000)
Subject: Merge "Parametrize Swift partition power"
X-Git-Tag: opnfv-6.0.0~2744
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=622d4cb6cf92704f7cbdd8683dd5c4d406646ce5;hp=4608c70e12734fa289463264d47f9a650c326dd4;p=apex-tripleo-heat-templates.git

Merge "Parametrize Swift partition power"
---

diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index e3f475c0..a7486490 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
+  SwiftPartPower:
+    default: 10
+    description: Partition Power to use when building Swift rings
+    type: number
   SwiftReplicas:
     type: number
     default: 1
@@ -24,6 +28,7 @@ resources:
       input_values:
         swift_hash_suffix: {get_param: SwiftHashSuffix}
         swift_password: {get_param: SwiftPassword}
+        swift_part_power: {get_param: SwiftPartPower}
         swift_devices:
           Fn::Join:
           - ', '
diff --git a/swift-source.yaml b/swift-source.yaml
index cf1cf9dc..ca0967a4 100644
--- a/swift-source.yaml
+++ b/swift-source.yaml
@@ -7,7 +7,7 @@ resources:
         swift:
           devices: { get_input: swift_devices }
           hash: { get_input: swift_hash_suffix }
-          part-power: 10
+          part-power: { get_input: swift_part_power }
           proxy-memcache: { get_input: swift_proxy_memcache }
           replicas: {get_input: swift_replicas }
           service-password: { get_input: swift_password }
diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index 103a7ec7..48154e23 100644
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -43,6 +43,7 @@ resources:
       input_values:
         swift_hash_suffix: {get_param: SwiftHashSuffix}
         swift_password: {get_param: SwiftPassword}
+        swift_part_power: {get_param: SwiftPartPower}
         swift_devices:
           Fn::Join:
           - ', '