X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fringbuilder.pp;h=a623da29a22bc850cf22d433b68da503cd906b15;hb=c7d996765ba86d245fb2a4f0ade01142689aafb0;hp=4296208b594b128c22f060c8a9528ce74d2d4b23;hpb=99f29102112272e3c905015bb428282ff7b72632;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/ringbuilder.pp b/puppet/manifests/ringbuilder.pp
index 4296208b..a623da29 100644
--- 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,6 @@ class tripleo::ringbuilder (
   }
 }
 
-include ::tripleo::ringbuilder
-
-package_manifest{'/var/lib/tripleo/installed-packages/ringbuilder': ensure => present}
+if hiera('step') >= 3 {
+  include ::tripleo::ringbuilder
+}