From dd6b7fe5422c2110ba54ee46a3a9aa72db2b1dee Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Tue, 17 Oct 2017 14:22:27 +0200 Subject: 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 (cherry picked from commit 0c8ba9651734a0e6180ca443c87c8c8ca5169d6c) --- environments/docker.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environments/docker.yaml b/environments/docker.yaml index 57379925..58691cc1 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -58,6 +58,8 @@ resource_registry: # OS::TripleO::Services::CinderBackup: ../docker/services/cinder-backup.yaml # OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml # + OS::TripleO::Services::SwiftDispersion: OS::Heat::None + # If SR-IOV is enabled on the compute nodes, it will need the SR-IOV # host configuration. OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None -- cgit 1.2.3-korg