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

This commit is contained in:
Jenkins 2017-06-16 23:33:12 +00:00 committed by Gerrit Code Review
commit 10c53f6189
1 changed files with 2 additions and 2 deletions

View File

@ -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