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

diff --combined environments/docker-ha.yaml
index 784a2a3,4a60bd6..474e996
--- 1/environments/docker-ha.yaml
--- 2/environments/docker-ha.yaml
+++ b/environments/docker-ha.yaml
@@@ -3,6 -3,9 +3,6 @@@
  # ...deploy..-e docker.yaml -e docker-ha.yaml
  resource_registry:
    # Pacemaker runs on the host
 -  OS::TripleO::Tasks::ControllerPreConfig: ../extraconfig/tasks/pre_puppet_pacemaker.yaml
 -  OS::TripleO::Tasks::ControllerPostConfig: ../extraconfig/tasks/post_puppet_pacemaker.yaml
 -  OS::TripleO::Tasks::ControllerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
    OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml
    OS::TripleO::Services::PacemakerRemote: ../puppet/services/pacemaker_remote.yaml
  
@@@ -10,8 -13,9 +10,9 @@@
    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