diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-16 15:08:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-16 15:08:36 +0000 |
| commit | 0efcbe60437191696af4b2f1e794ef24d8eff7a2 (patch) | |
| tree | b6c45038a8217de717e06e3874d19b14d668b2f6 | |
| parent | 5dd9748bb0281fb2c3f55d08a61286efbfb1854f (diff) | |
| parent | 0e0ccda3696580b46d30e0732bf85c6b510bba23 (diff) | |
Merge "Fall back to non-containerized cinder-volume to unblock CI"
| -rw-r--r-- | environments/docker.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index 5de0c8d9..d41f3008 100644 --- 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 |