diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-03-22 16:22:45 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-03-25 08:28:00 -0400 |
| commit | 9988bd25aa4bac1375ef4783d636c7adecedee92 (patch) | |
| tree | 43869cc445e5e2e72f3d96655f99e7aa358495eb /puppet/manifests/ringbuilder.pp | |
| parent | c6249a1af273886fa326563dbc696af8fb561caa (diff) | |
Increment step count to include ringbuilder
This patch wires in ringbuilder.pp so that it is always
asserted like the other manifests and it fixes the misaligned
step sequencing in calling our overcloud controller manifests.
Previously it was called as a separate software deployment outside of
the hiera step sequence. This made things confusing in
controller-post.yaml since the deployment names didn't align
with the step hiera variables after step 3. Now that we call it
just like the other modules it should make gradually moving this
code to puppet-tripleo more straightforward as well.
Change-Id: Ibd4f51f65da475bb20a6b08d7bda673f330a5464
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 +} |