openstack/tripleo-heat-templates
Code Issues Proposed changes

Disable SwiftDispersion when using docker

Browse Source 
We currently have the following in the registry:
OS::TripleO::Services::SwiftDispersion: puppet/services/swift-dispersion.yaml

Since this service is included by default in the Controller role
it will be installed on the host even on a containerized deployment.

Let's noop this in docker.yaml until a containerized version of it
gets merged.

Change-Id: Ic2793d0cfb7b20f4661cb1a45793cae67a4868b4
Closes-Bug: #1723788
This commit is contained in:
Michele Baldessari 2017-10-17 14:22:27 +02:00
parent ba4a74665f
commit 0c8ba96517
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::CinderApi: ../docker/services/cinder-api.yaml
OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml
OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.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 # If SR-IOV is enabled on the compute nodes, it will need the SR-IOV
# host configuration. # host configuration.