aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-24 10:16:14 +0000
committerGerrit Code Review <review@openstack.org>2017-10-24 10:16:14 +0000
commitfa33703d79cd8add96f1a53b3531754b260f4c05 (patch)
tree87eccc898b1805a4df40e070df28eb3b5dd9c062
parent684bb3689501376f44be677adde4f00ce7185928 (diff)
parentdd6b7fe5422c2110ba54ee46a3a9aa72db2b1dee (diff)
Merge "Disable SwiftDispersion when using docker" into stable/pike
-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