aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorMichele Baldessari <michele@acksyn.org>2017-10-17 14:22:27 +0200
committerEmilien Macchi <emilien@redhat.com>2017-10-23 17:01:05 +0000
commitdd6b7fe5422c2110ba54ee46a3a9aa72db2b1dee (patch)
tree45c32be05f54aeb0129d2440b9afce81538e2589 /environments
parent8da5e1f7006d8128e83fe151da930dc5a670180d (diff)
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)
Diffstat (limited to 'environments')
-rw-r--r--environments/docker.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 5737992..58691cc 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