aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-14 10:21:35 +0000
committerGerrit Code Review <review@openstack.org>2016-10-14 10:21:35 +0000
commit1753b19a08efa5d6d859cf9096acd014cb6b91c9 (patch)
tree89db83ed606dc28601d30cdcd6ac5c8a7b015089
parent9d01feaf7a71ad7823f2b06ddd8259cd222e1c2a (diff)
parent1c8ef6c5e8473ccde3755710540225dbd74edb5b (diff)
Merge "Fix default Swift ring partition power"
-rw-r--r--puppet/services/swift-ringbuilder.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/swift-ringbuilder.yaml b/puppet/services/swift-ringbuilder.yaml
index e151d185..8ed4e9f4 100644
--- a/puppet/services/swift-ringbuilder.yaml
+++ b/puppet/services/swift-ringbuilder.yaml
@@ -48,6 +48,8 @@ outputs:
config_settings:
tripleo::profile::base::swift::ringbuilder::build_ring: {get_param: SwiftRingBuild}
tripleo::profile::base::swift::ringbuilder::replicas: {get_param: SwiftReplicas}
+ tripleo::profile::base::swift::ringbuilder::part_power: {get_param: SwiftPartPower}
+ tripleo::profile::base::swift::ringbuilder::min_part_hours: {get_param: SwiftMinPartHours}
tripleo::profile::base::swift::ringbuilder::raw_disk_prefix: 'r1z1-'
tripleo::profile::base::swift::ringbuilder::raw_disks:
yaql:
@@ -59,7 +61,5 @@ outputs:
template: ':%PORT%/DEVICE'
for_each:
DEVICE: {get_param: SwiftRawDisks}
- swift::ringbuilder::part_power: {get_param: SwiftPartPower}
- swift::ringbuilder::min_part_hours: {get_param: SwiftMinPartHours}
step_config: |
include ::tripleo::profile::base::swift::ringbuilder