summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-12-14 14:09:07 -0500
committerDan Prince <dprince@redhat.com>2015-12-14 14:09:07 -0500
commit07e65b4784d084ac2addb2cb7a0099ac9fed325c (patch)
tree237d65b3c9b833997af2097f68f23d2f555e6e2b
parent64c2ca04a14ef8e31a861fa394422731d9ca897f (diff)
Set swift replicas = min(device_count, replicas)
Per Swift upstream commit: 7035639dfd239b52d4ed46aae50f78d16ec8cbfe Swift's ringbuilder now validates that the number of devices is greater than or equal to the replicas. Change-Id: I56eaa9ddda138e87f7615d3bde797b568fa5e302 Related-bug: #1525356
-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,
} ->