From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 17 Oct 2017 12:22:27 +0000 (+0200)
Subject: Disable SwiftDispersion when using docker
X-Git-Tag: opnfv-6.0.0~56^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dd6b7fe5422c2110ba54ee46a3a9aa72db2b1dee;p=apex-tripleo-heat-templates.git

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)
---

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