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

diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml
index 442262b..4a60bd6 100644 (file)
--- 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