Fall back to non-containerized cinder-volume to unblock CI

CI was stuck on collecting logs. The collect-logs playbook, which
normally takes just a few minutes, took more than an hour and was
eventually killed.

The playbook was stuck on collecting LVM info on the overcloud node,
which runs this command:

  (vgs; pvs; lvs) &> /var/log/extra/lvm.txt

Therefore it's very likely that the problematic part is the LVM setup
in the containerized cinder-volume service, and falling back to
non-contianerized for the time being should get the CI going
again.

Change-Id: Ib10e4f18d967d356a15b97f58c488f8402a73356
Closes-Bug: #1698136

diff --git a/environments/docker.yaml b/environments/docker.yaml
index 5de0c8d..d41f300 100644 (file)
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -54,7 +54,8 @@ resource_registry:
   OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml
   OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml
   OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml
-  OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
+  # FIXME: Had to remove this to unblock containers CI. Should be put back when fixed.
+  # OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
 
   OS::TripleO::PostDeploySteps: ../docker/post.yaml
   OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml