diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-17 11:11:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-17 11:11:51 +0000 |
| commit | 2e3ff0a6734bce712ab11f37a9dc2454f1420d76 (patch) | |
| tree | 64ec94420d305ceae125f97825ccd99e1eb66f9f /environments | |
| parent | 7ec199d64e2eb23b084f32bb42a1e8802fbf9931 (diff) | |
| parent | 4b8720e6c1aa1d8e5a5163aefaccf5b78f48896b (diff) | |
Merge "Remove old ControllerConfig override from puppet-pacemaker.yaml"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 1 |
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 |