X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fringbuilder.pp;h=2411ff842f26a4a54e91d4ef643c753956012f10;hb=af9352e8007f8eb9a0bbec36a49e07328b0cd3f6;hp=2d880d33cb409b7c8ac3ae20636fa742d9f99a94;hpb=3e8010dc8506755f193d6e0f84006452b4eaeee5;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/ringbuilder.pp b/puppet/manifests/ringbuilder.pp
index 2d880d33..2411ff84 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'
 ){
@@ -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
+}