From 1b556b6a04f0e5b3bb304311fac5b91a80f89cac Mon Sep 17 00:00:00 2001 From: Damien Ciabrini Date: Fri, 21 Jul 2017 08:14:24 -0400 Subject: [PATCH] Fall back to non-containerized cinder-backup and cinder-volume for HA The non-HA version of those two A/P Cinder services currently runs non-containerized, as explained in I9ac74d6717533f59945694b4a43fe56d7ca768c6 and Ib10e4f18d967d356a15b97f58c488f8402a73356. Disable their HA counterpart until the non-HA version is re-enabled. Change-Id: I2aa49330fa361e330448dc9aa88e3812d9a7d464 --- environments/docker-ha.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml index 442262b315..4a60bd6a2d 100644 --- a/environments/docker-ha.yaml +++ b/environments/docker-ha.yaml @@ -13,8 +13,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