summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 23:33:12 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 23:33:12 +0000
commit10c53f61891756e40e7bd1fc536df25e051485ae (patch)
treef5716e7e22467952927f512b02ce9c8fe63e5e25
parent88f123915209bb9dfad01019ee9444ce45ba8f43 (diff)
parent6e72aa9f8157a57dfe4db7bc0a5defb86d800ea6 (diff)
Merge "Fall back to non-containerized cinder-backup to unblock OVB CI"
-rw-r--r--environments/docker.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index d41f300..4e938e6 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -53,8 +53,8 @@ resource_registry:
53 OS::TripleO::Services::Multipathd: ../docker/services/multipathd.yaml 53 OS::TripleO::Services::Multipathd: ../docker/services/multipathd.yaml
54 OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml 54 OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml
55 OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml 55 OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml
56 OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml 56 # FIXME: Had to remove these to unblock containers CI. They should be put back when fixed.
57 # FIXME: Had to remove this to unblock containers CI. Should be put back when fixed. 57 # OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml
58 # OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml 58 # OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
59 59
60 OS::TripleO::PostDeploySteps: ../docker/post.yaml 60 OS::TripleO::PostDeploySteps: ../docker/post.yaml