diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-24 13:03:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-24 13:03:57 +0000 |
| commit | 5cbcc8377c49e395dc1d02a976d9b4a94253f5ca (patch) | |
| tree | 62705cb711cc6e9c52da2fcec3ca5a62a30fea94 /environments | |
| parent | 84e6bff8a62539b381c5706fab7b8ea90f00f0dd (diff) | |
| parent | cdc3477b7780c751807fe18c3767762189cf03b4 (diff) | |
Merge "Remove non-containerized pacemaker resources on upgrade"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker-ha.yaml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml index 442262b3..784a2a3b 100644 --- a/environments/docker-ha.yaml +++ b/environments/docker-ha.yaml @@ -3,9 +3,6 @@ # ...deploy..-e docker.yaml -e docker-ha.yaml resource_registry: # Pacemaker runs on the host - OS::TripleO::Tasks::ControllerPreConfig: ../extraconfig/tasks/pre_puppet_pacemaker.yaml - OS::TripleO::Tasks::ControllerPostConfig: ../extraconfig/tasks/post_puppet_pacemaker.yaml - OS::TripleO::Tasks::ControllerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../puppet/services/pacemaker_remote.yaml |