openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fall back to non-containerized cinder-backup and cinder-volume for HA"

This commit is contained in:
Jenkins 2017-07-25 14:59:34 +00:00 committed by Gerrit Code Review
parent 8193431e94 1b556b6a04
commit ec25c792d7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
environments/docker-ha.yaml
View File

@ -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