openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fall back to non-containerized cinder-volume to unblock CI"

Browse Source
This commit is contained in:
Jenkins
2017-06-16 15:08:36 +00:00
committed by Gerrit Code Review
parent 5dd9748bb0 0e0ccda369
commit 0efcbe6043
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
environments/docker.yaml
View File

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