aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-15 09:32:45 +0000
committerGerrit Code Review <review@openstack.org>2015-12-15 09:32:45 +0000
commit3e8010dc8506755f193d6e0f84006452b4eaeee5 (patch)
tree93d4eedb38512984a8b76a7ef38a48e9e6e4469f /puppet
parent55e0c425f565ea825421d2a4d062449d5347da8d (diff)
parent07e65b4784d084ac2addb2cb7a0099ac9fed325c (diff)
Merge "Set swift replicas = min(device_count, replicas)"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/ringbuilder.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/manifests/ringbuilder.pp b/puppet/manifests/ringbuilder.pp
index 4296208b..2d880d33 100644
--- a/puppet/manifests/ringbuilder.pp
+++ b/puppet/manifests/ringbuilder.pp
@@ -70,7 +70,7 @@ class tripleo::ringbuilder (
# create local rings
swift::ringbuilder::create{ ['object', 'account', 'container']:
part_power => $part_power,
- replicas => $replicas,
+ replicas => min(count($device_array), $replicas),
min_part_hours => $min_part_hours,
} ->