aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-19 09:11:24 +0000
committerGerrit Code Review <review@openstack.org>2015-05-19 09:11:24 +0000
commit0e1f4815bebff3fb1a9ec7df8c95a9c7afe07577 (patch)
tree6a44c6450cfba5d3dbe3015500af5c0995a3912b
parent2eca0d61ed187af23f55ab580726874da0587da7 (diff)
parentf6c3f8da99af0db4aa2bc9b970542fa63ee28cfe (diff)
Merge "Environment which configures puppet pacemaker."
-rw-r--r--environments/puppet-pacemaker.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
new file mode 100644
index 00000000..f235cf8f
--- /dev/null
+++ b/environments/puppet-pacemaker.yaml
@@ -0,0 +1,4 @@
+# An environment which enables configuration of an
+# Overcloud controller with Pacemaker.
+resource_registry:
+ OS::TripleO::ControllerConfig: ../puppet/controller-config-pacemaker.yaml