From 16827bbea87a82f0b364b978b6a9a9fc906611fd Mon Sep 17 00:00:00 2001 From: Kobi Samoray Date: Tue, 22 Mar 2016 12:10:11 +0200 Subject: [PATCH] Devstack: Use OVS_BRIDGE when value is set Devstack allows configuration of the OVS bridge which will be used. Octavia plugin has the default, br-int hardcoded. Plugin should use OVS_BRIDGE when the value is set, or default to br-int. Change-Id: I1a92667790c4e58691c3d946d6cecc6527211b9b --- devstack/plugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 13f1c1a544..4daf4c25fe 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -126,7 +126,7 @@ function create_mgmt_network_interface { MGMT_PORT_ID=${id_and_mac[0]} MGMT_PORT_MAC=${id_and_mac[1]} MGMT_PORT_IP=$(neutron port-show $MGMT_PORT_ID | awk '/ "ip_address": / {print $7; exit}' | sed -e 's/"//g' -e 's/,//g' -e 's/}//g') - sudo ovs-vsctl -- --may-exist add-port br-int o-hm0 -- set Interface o-hm0 type=internal -- set Interface o-hm0 external-ids:iface-status=active -- set Interface o-hm0 external-ids:attached-mac=$MGMT_PORT_MAC -- set Interface o-hm0 external-ids:iface-id=$MGMT_PORT_ID + sudo ovs-vsctl -- --may-exist add-port ${OVS_BRIDGE:-br-int} o-hm0 -- set Interface o-hm0 type=internal -- set Interface o-hm0 external-ids:iface-status=active -- set Interface o-hm0 external-ids:attached-mac=$MGMT_PORT_MAC -- set Interface o-hm0 external-ids:iface-id=$MGMT_PORT_ID sudo ip link set dev o-hm0 address $MGMT_PORT_MAC sudo dhclient -v o-hm0 iniset $OCTAVIA_CONF health_manager controller_ip_port_list $MGMT_PORT_IP:$OCTAVIA_HM_LISTEN_PORT