From 8f509a38a2f4944b51c2b0bc3f2afd72263c10cb Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Tue, 9 Apr 2019 18:37:35 -0700 Subject: 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 --- devstack/lib/ironic | 2 +- zuul.d/ironic-jobs.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 3e6a2af89..274ff7182 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -2616,7 +2616,7 @@ function get_ironic_node_prefix { function setup_vxlan_network { sudo ovs-vsctl add-port $IRONIC_VM_NETWORK_BRIDGE phy-brbm-infra - sudo ovs-vsctl add-port br-infra phy-infra-brbm + sudo ovs-vsctl add-port $PUBLIC_BRIDGE phy-infra-brbm sudo ovs-vsctl set interface phy-brbm-infra type=patch sudo ovs-vsctl set interface phy-infra-brbm type=patch sudo ovs-vsctl set interface phy-infra-brbm options:peer=phy-brbm-infra diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 89df3d52c..8d7bc63fc 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -441,6 +441,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 -- cgit v1.2.1