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 /overcloud-resource-registry-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 'overcloud-resource-registry-puppet.yaml')
-rw-r--r-- | overcloud-resource-registry-puppet.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 2b9da710..744e115f 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -11,6 +11,8 @@ resource_registry: OS::TripleO::CephStorage: puppet/ceph-storage-puppet.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: net-config-noop.yaml OS::TripleO::ControllerPostDeployment: puppet/controller-post-puppet.yaml + # set to controller-config-pacemaker.yaml to enable pacemaker + OS::TripleO::ControllerConfig: puppet/controller-config.yaml OS::TripleO::ComputePostDeployment: puppet/compute-post-puppet.yaml OS::TripleO::ObjectStoragePostDeployment: puppet/swift-storage-post.yaml OS::TripleO::BlockStoragePostDeployment: puppet/cinder-storage-post.yaml |