diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-10 21:49:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-10 21:49:55 +0000 |
| commit | f3c58d50d327e4bbd1bc9cdd70710ba9778336a3 (patch) | |
| tree | 73cf49405fc6d9945cd7a832dc8eb32b308ff150 /environments | |
| parent | 87ddcb8380208b76c0ebda637bbaf17f59d7d4f7 (diff) | |
| parent | ca959c66fee38df15ae1662b108e64e1d2bb2c42 (diff) | |
Merge "Noop controller pre and post config resources."
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker-ha.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml index 474e9966..1e25a357 100644 --- a/environments/docker-ha.yaml +++ b/environments/docker-ha.yaml @@ -5,6 +5,8 @@ resource_registry: # Pacemaker runs on the host OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml OS::TripleO::Services::PacemakerRemote: ../puppet/services/pacemaker_remote.yaml + OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None + OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None # Services that are disabled for HA deployments with pacemaker OS::TripleO::Services::Keepalived: OS::Heat::None |