diff options
author | Dan Prince <dprince@redhat.com> | 2015-05-06 22:22:39 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2015-05-11 08:23:34 -0400 |
commit | 607ea9c8d30d752b01881e2ac913c712f0243272 (patch) | |
tree | fb14aa7a7d61f2bf0a05e7149f51d436a4b0e0f5 /puppet/controller-post-puppet.yaml | |
parent | 92377361c76a612457cc147a0608d94db430a771 (diff) |
Puppet: Split out controller pacemaker manifest
This patch adds support for using the Heat resource registry
so that end users can enable pacemaker. Using this approach
allows us to isolate all of the pacemaker logic for the
controller in a single template rather than use conditionals
for every service that must support it.
Change-Id: Ibefb80d0d8f98404133e4c31cf078d729b64dac3
Diffstat (limited to 'puppet/controller-post-puppet.yaml')
-rw-r--r-- | puppet/controller-post-puppet.yaml | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/puppet/controller-post-puppet.yaml b/puppet/controller-post-puppet.yaml index debd7154..361e6a43 100644 --- a/puppet/controller-post-puppet.yaml +++ b/puppet/controller-post-puppet.yaml @@ -10,16 +10,7 @@ parameters: resources: ControllerPuppetConfig: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - options: - enable_hiera: True - enable_facter: False - outputs: - - name: result - config: - get_file: manifests/overcloud_controller.pp + type: OS::TripleO::ControllerConfig # Step through a series of Puppet runs using the same manifest. # NOTE(dprince): Heat breakpoints would make for a really cool way to step |