From 9988bd25aa4bac1375ef4783d636c7adecedee92 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 22 Mar 2016 16:22:45 -0400 Subject: 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.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'puppet/controller-config.yaml') diff --git a/puppet/controller-config.yaml b/puppet/controller-config.yaml index f85e1a9e..f7a6a56d 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: -- cgit 1.2.3-korg