Increment step count to include ringbuilder
authorDan Prince <dprince@redhat.com>
Tue, 22 Mar 2016 20:22:45 +0000 (16:22 -0400)
committerDan Prince <dprince@redhat.com>
Fri, 25 Mar 2016 12:28:00 +0000 (08:28 -0400)
commit9988bd25aa4bac1375ef4783d636c7adecedee92
tree43869cc445e5e2e72f3d96655f99e7aa358495eb
parentc6249a1af273886fa326563dbc696af8fb561caa
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
puppet/controller-config-pacemaker.yaml
puppet/controller-config.yaml
puppet/controller-post.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp
puppet/manifests/ringbuilder.pp