diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-16 23:33:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-16 23:33:12 +0000 |
| commit | 10c53f61891756e40e7bd1fc536df25e051485ae (patch) | |
| tree | f5716e7e22467952927f512b02ce9c8fe63e5e25 /environments/docker.yaml | |
| parent | 88f123915209bb9dfad01019ee9444ce45ba8f43 (diff) | |
| parent | 6e72aa9f8157a57dfe4db7bc0a5defb86d800ea6 (diff) | |
Merge "Fall back to non-containerized cinder-backup to unblock OVB CI"
Diffstat (limited to 'environments/docker.yaml')
| -rw-r--r-- | environments/docker.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index d41f3008..4e938e69 100644 --- 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 |