summaryrefslogtreecommitdiff
path: root/zuul.d
diff options
context:
space:
mode:
authorJulia Kreger <juliaashleykreger@gmail.com>2019-04-09 18:37:35 -0700
committerJulia Kreger <juliaashleykreger@gmail.com>2019-04-10 07:10:49 -0700
commit1d0accbbe111577022c6617c616ae7fa2c50c970 (patch)
tree430c96be7c082ea34845a230f1274ee33534c8c7 /zuul.d
parente8a8b7897f8b9509c2ba06b4ec4bb882ebf57c83 (diff)
downloadironic-1d0accbbe111577022c6617c616ae7fa2c50c970.tar.gz
Use the PUBLIC_BRIDGE for vxlan
The PUBLIC_BRIDGE parameter, for most multinode zuul jobs defaults to br-infra in cases where native zuul configuration is used. However, this is not true for legacy jobs still using devstack-gate. When jobs are invoked with devstack-gate, the bridge must be set to match the devstack-gate scripting as zuul *does not* setup the vxlan bridge for us. Devstack-gate does so. Change-Id: I37bff3c4d930ada483690d0dea17cb9a64d51fd2
Diffstat (limited to 'zuul.d')
-rw-r--r--zuul.d/ironic-jobs.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index da1ebfdef..acfc69d5a 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -440,6 +440,7 @@
PHYSICAL_NETWORK: mynetwork
Q_ML2_TENANT_NETWORK_TYPE: vlan
VIRT_DRIVER: ironic
+ PUBLIC_BRIDGE: br-infra
devstack_services:
c-api: False
c-bak: False