aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller-config.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-03-22 16:22:45 -0400
committerDan Prince <dprince@redhat.com>2016-03-25 08:28:00 -0400
commit9988bd25aa4bac1375ef4783d636c7adecedee92 (patch)
tree43869cc445e5e2e72f3d96655f99e7aa358495eb /puppet/controller-config.yaml
parentc6249a1af273886fa326563dbc696af8fb561caa (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/controller-config.yaml')
-rw-r--r--puppet/controller-config.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/controller-config.yaml b/puppet/controller-config.yaml
index f85e1a9..f7a6a56 100644
--- a/puppet/controller-config.yaml
+++ b/puppet/controller-config.yaml
@@ -22,7 +22,10 @@ resources:
outputs:
- name: result
config:
- get_file: manifests/overcloud_controller.pp
+ list_join:
+ - ''
+ - - get_file: manifests/overcloud_controller.pp
+ - get_file: manifests/ringbuilder.pp
outputs:
OS::stack_id: