openstack/ironic
Code Issues Proposed changes

Use the PUBLIC_BRIDGE for vxlan

Browse Source 
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
This commit is contained in:
Julia Kreger 2019-04-09 18:37:35 -07:00
parent e8a8b7897f
commit 1d0accbbe1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/ironic
View File

@ -2619,7 +2619,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

1
zuul.d/ironic-jobs.yaml
View File

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