From 2f5596e59051ab23dfc0dd85b083e9328600fbb1 Mon Sep 17 00:00:00 2001 From: Huan Xie Date: Tue, 5 Apr 2016 22:22:48 -0700 Subject: [PATCH] Use configured values instead of default value Variables PUBLIC_INTERFACE_DEFAULT and GUEST_INTERFACE_DEFAULT are only use to provide default value, deployment script should not use such values directly Closes-Bug: #1566768 Change-Id: Ib543b416df861086fa2edbe7df769b224d0b0add --- lib/neutron_plugins/openvswitch_agent | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/neutron_plugins/openvswitch_agent b/lib/neutron_plugins/openvswitch_agent index 339d5fd96a..aba2587ea4 100644 --- a/lib/neutron_plugins/openvswitch_agent +++ b/lib/neutron_plugins/openvswitch_agent @@ -96,17 +96,17 @@ function neutron_plugin_configure_plugin_agent { # Set up domU's L2 agent: - # Create a bridge "br-$GUEST_INTERFACE_DEFAULT" - _neutron_ovs_base_add_bridge "br-$GUEST_INTERFACE_DEFAULT" - # Add $GUEST_INTERFACE_DEFAULT to that bridge - sudo ovs-vsctl -- --may-exist add-port "br-$GUEST_INTERFACE_DEFAULT" $GUEST_INTERFACE_DEFAULT + # Create a bridge "br-$VLAN_INTERFACE" + _neutron_ovs_base_add_bridge "br-$VLAN_INTERFACE" + # Add $VLAN_INTERFACE to that bridge + sudo ovs-vsctl -- --may-exist add-port "br-$VLAN_INTERFACE" $VLAN_INTERFACE # Create external bridge and add port _neutron_ovs_base_add_bridge $PUBLIC_BRIDGE - sudo ovs-vsctl -- --may-exist add-port $PUBLIC_BRIDGE $PUBLIC_INTERFACE_DEFAULT + sudo ovs-vsctl -- --may-exist add-port $PUBLIC_BRIDGE $PUBLIC_INTERFACE # Set bridge mappings to "physnet1:br-$GUEST_INTERFACE_DEFAULT" - iniset "/$Q_PLUGIN_CONF_FILE.domU" ovs bridge_mappings "physnet1:br-$GUEST_INTERFACE_DEFAULT,physnet-ex:$PUBLIC_BRIDGE" + iniset "/$Q_PLUGIN_CONF_FILE.domU" ovs bridge_mappings "physnet1:br-$VLAN_INTERFACE,physnet-ex:$PUBLIC_BRIDGE" # Set integration bridge to domU's iniset "/$Q_PLUGIN_CONF_FILE.domU" ovs integration_bridge $OVS_BRIDGE # Set root wrap