aboutsummaryrefslogtreecommitdiffstats
path: root/environments/puppet-pacemaker.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-12-05 02:32:30 +0100
committerGiulio Fidente <gfidente@redhat.com>2017-01-03 19:45:43 +0100
commit4b8720e6c1aa1d8e5a5163aefaccf5b78f48896b (patch)
tree8952d1298a98576180bd353db3daae992705bfa0 /environments/puppet-pacemaker.yaml
parent7057ec6f7cedbf63ee0d0110cc14a61a9f2b07e1 (diff)
Remove old ControllerConfig override from puppet-pacemaker.yaml
Previously we had to override the location of the manifest file pushed on the controller nodes when deploying with Pacemaker, this is not needed anymore with composable roles. Change-Id: I1e010099263a325d06483f498c70582b008c31e2
Diffstat (limited to 'environments/puppet-pacemaker.yaml')
-rw-r--r--environments/puppet-pacemaker.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index b8e93f20..0b71dbd9 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -1,7 +1,6 @@
# An environment which enables configuration of an
# Overcloud controller with Pacemaker.
resource_registry:
- OS::TripleO::ControllerConfig: ../puppet/controller-config-pacemaker.yaml
OS::TripleO::Tasks::ControllerPrePuppet: ../extraconfig/tasks/pre_puppet_pacemaker.yaml
OS::TripleO::Tasks::ControllerPostPuppet: ../extraconfig/tasks/post_puppet_pacemaker.yaml
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml