Fall back to non-containerized cinder-backup to unblock OVB CI

The previous fix Ib10e4f18d967d356a15b97f58c488f8402a73356 made
multinode CI pass, but there was still an error during volume
scheduling on OVB:

OSError: [Errno 13] Permission denied: '/var/lib/cinder/conversion'

This was most likely due to cinder-volume was running on host and used
host's cinder user, while we still deployed containerized
cinder-backup and it chowned /var/lib/cinder under kolla's cinder user
whose UID doesn't match the baremetal one.

We didn't hit this issue in the multinode job because it doesn't
presently deploy cinder-backup service at all.

Co-Authored-By: Martin André <m.andre@redhat.com>
Change-Id: I9ac74d6717533f59945694b4a43fe56d7ca768c6
Closes-Bug: #1698136

diff --git a/environments/docker.yaml b/environments/docker.yaml
index d41f300..4e938e6 100644 (file)
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -53,8 +53,8 @@ resource_registry:
   OS::TripleO::Services::Multipathd: ../docker/services/multipathd.yaml
   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
-  # FIXME: Had to remove this to unblock containers CI. Should be put back when fixed.
+  # FIXME: Had to remove these to unblock containers CI. They should be put back when fixed.
+  # OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml
   # OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
 
   OS::TripleO::PostDeploySteps: ../docker/post.yaml