diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-29 16:03:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-29 16:03:05 +0000 |
| commit | 7d704fbd074cdeb2b381aab353ee1deaeb9ae736 (patch) | |
| tree | 625a666b1b4564691ee96fd2fa9e47fce8840cbd /puppet/manifests/ringbuilder.pp | |
| parent | 717d949ddfe128c84239418c5559464172ec236f (diff) | |
| parent | 9988bd25aa4bac1375ef4783d636c7adecedee92 (diff) | |
Merge "Increment step count to include ringbuilder"
Diffstat (limited to 'puppet/manifests/ringbuilder.pp')
| -rw-r--r-- | puppet/manifests/ringbuilder.pp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/puppet/manifests/ringbuilder.pp b/puppet/manifests/ringbuilder.pp index 2d880d33..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' ){ @@ -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 +} |