From 0c8ba9651734a0e6180ca443c87c8c8ca5169d6c Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 17 Oct 2017 14:22:27 +0200 Subject: [PATCH] Disable SwiftDispersion when using docker 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 --- environments/docker.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/environments/docker.yaml b/environments/docker.yaml index f7b75a4652..d290e0ba9f 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -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.