summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-25 14:59:34 +0000
committerGerrit Code Review <review@openstack.org>2017-07-25 14:59:34 +0000
commitec25c792d73c4a4b6e14ddfa0ffa385211fa1a29 (patch)
treef3f9bd0b46a04b823c53164ff6ca93876d820a54 /environments
parent8193431e944841dfc42f6796eabb2b30afe4b1f1 (diff)
parent1b556b6a04f0e5b3bb304311fac5b91a80f89cac (diff)
Merge "Fall back to non-containerized cinder-backup and cinder-volume for HA"
Diffstat (limited to 'environments')
-rw-r--r--environments/docker-ha.yaml5
1 files changed, 3 insertions, 2 deletions
diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml
index 784a2a3b..474e9966 100644
--- a/environments/docker-ha.yaml
+++ b/environments/docker-ha.yaml
@@ -10,8 +10,9 @@ resource_registry:
OS::TripleO::Services::Keepalived: OS::Heat::None
# HA Containers managed by pacemaker
- OS::TripleO::Services::CinderVolume: ../docker/services/pacemaker/cinder-volume.yaml
- OS::TripleO::Services::CinderBackup: ../docker/services/pacemaker/cinder-backup.yaml
+ # FIXME: enable those Cinder services once their non-HA counterpart are enabled
+ # OS::TripleO::Services::CinderVolume: ../docker/services/pacemaker/cinder-volume.yaml
+ # OS::TripleO::Services::CinderBackup: ../docker/services/pacemaker/cinder-backup.yaml
OS::TripleO::Services::Clustercheck: ../docker/services/pacemaker/clustercheck.yaml
OS::TripleO::Services::HAproxy: ../docker/services/pacemaker/haproxy.yaml
OS::TripleO::Services::MySQL: ../docker/services/pacemaker/database/mysql.yaml