9988bd25aa
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
34 lines
828 B
YAML
34 lines
828 B
YAML
heat_template_version: 2015-04-30
|
|
|
|
description: >
|
|
A software config which runs manifests/overcloud_controller.pp
|
|
|
|
parameters:
|
|
ConfigDebug:
|
|
default: false
|
|
description: Whether to run config management (e.g. Puppet) in debug mode.
|
|
type: boolean
|
|
|
|
resources:
|
|
|
|
ControllerPuppetConfigImpl:
|
|
type: OS::Heat::SoftwareConfig
|
|
properties:
|
|
group: puppet
|
|
options:
|
|
enable_debug: {get_param: ConfigDebug}
|
|
enable_hiera: True
|
|
enable_facter: False
|
|
outputs:
|
|
- name: result
|
|
config:
|
|
list_join:
|
|
- ''
|
|
- - get_file: manifests/overcloud_controller.pp
|
|
- get_file: manifests/ringbuilder.pp
|
|
|
|
outputs:
|
|
OS::stack_id:
|
|
description: The software config which runs overcloud_controller.pp
|
|
value: {get_resource: ControllerPuppetConfigImpl}
|