openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable SwiftDispersion when using docker"

This commit is contained in:
Zuul 2017-10-19 03:23:25 +00:00 committed by Gerrit Code Review
parent d227a1f257 0c8ba96517
commit 5f4c433bb6
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/docker.yaml
View File

@ -56,6 +56,9 @@ resource_registry:
OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml
OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml
OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
# FIXME: Note we explicitely disable SwiftDispersion until a containerized version of it is merged
OS::TripleO::Services::SwiftDispersion: OS::Heat::None
# If SR-IOV is enabled on the compute nodes, it will need the SR-IOV
# host configuration.