Merge "Disable Swift services in all scenario jobs"
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 77947fa..2bd6f5a 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -38,6 +38,11 @@
neutron-tag-ports-during-bulk-creation: true
br-ex-tcpdump: true
br-int-flows: true
+ # We don't need Swift to be run in the Neutron jobs
+ s-account: false
+ s-container: false
+ s-object: false
+ s-proxy: false
devstack_local_conf:
post-config:
$NEUTRON_CONF:
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 4eeeba0..728eed8 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -297,6 +297,11 @@
neutron-log: true
neutron-port-forwarding: true
cinder: true
+ # We don't need Swift to be run in the Neutron jobs
+ s-account: false
+ s-container: false
+ s-object: false
+ s-proxy: false
devstack_local_conf:
post-config:
$NEUTRON_CONF:
@@ -359,6 +364,11 @@
neutron-trunk: true
neutron-log: true
neutron-port-forwarding: true
+ # We don't need Swift to be run in the Neutron jobs
+ s-account: false
+ s-container: false
+ s-object: false
+ s-proxy: false
devstack_localrc:
USE_PYTHON3: true
devstack_local_conf: