diff options
Diffstat (limited to 'puppet/manifests/ringbuilder.pp')
| -rw-r--r-- | puppet/manifests/ringbuilder.pp | 11 |
1 files changed, 7 insertions, 4 deletions
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 +} |