Merge "Remove unused redis_vip parameter"

[apex-tripleo-heat-templates.git] / puppet / manifests / ringbuilder.pp

diff --git a/puppet/manifests/ringbuilder.pp b/puppet/manifests/ringbuilder.pp
index 4296208..2411ff8 100644 (file)
--- a/puppet/manifests/ringbuilder.pp
+++ b/puppet/manifests/ringbuilder.pp
@@ -13,8 +13,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-include ::tripleo::packages
-
 define add_devices(
   $swift_zones = '1'
 ){
@@ -70,7 +68,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,
     } ->
 
@@ -91,6 +89,11 @@ class tripleo::ringbuilder (
   }
 }
 
-include ::tripleo::ringbuilder
+if hiera('step') >= 2 {
+  # pre-install swift here so we can build rings
+  include ::swift
+}
 
-package_manifest{'/var/lib/tripleo/installed-packages/ringbuilder': ensure => present}
+if hiera('step') >= 3 {
+  include ::tripleo::ringbuilder
+}