openstack/devstack
Code Issues Proposed changes

Remove no_wait ovs flag from vmw_nsx 3rd party lib

Browse Source 
The no_wait flag can trigger a race conditon with ip addr flush
if the public bridge is not yet up. Due to this race condition
the local route for the external subnet might not be added.

The patch also renames br-ex to $PUBLIC_BRIDGE in some places

Change-Id: I11335c99dba580e7ca26b0b15b0df8dead367fdc
This commit is contained in:
taturiello 2014-10-15 05:09:45 -07:00 committed by Sean Dague
parent ce1f133732
commit e7f071b49f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/neutron_thirdparty/vmware_nsx vendored
View File

@ -8,7 +8,7 @@
# * enable_service vmware_nsx --> to execute this third-party addition # * enable_service vmware_nsx --> to execute this third-party addition
# * PUBLIC_BRIDGE --> bridge used for external connectivity, typically br-ex # * PUBLIC_BRIDGE --> bridge used for external connectivity, typically br-ex
# * NSX_GATEWAY_NETWORK_INTERFACE --> interface used to communicate with the NSX Gateway # * NSX_GATEWAY_NETWORK_INTERFACE --> interface used to communicate with the NSX Gateway
# * NSX_GATEWAY_NETWORK_CIDR --> CIDR to configure br-ex, e.g. 172.24.4.211/24 # * NSX_GATEWAY_NETWORK_CIDR --> CIDR to configure $PUBLIC_BRIDGE, e.g. 172.24.4.211/24
# Save trace setting # Save trace setting
NSX3_XTRACE=$(set +o | grep xtrace) NSX3_XTRACE=$(set +o | grep xtrace)
@ -29,7 +29,7 @@ function configure_vmware_nsx {
function init_vmware_nsx { function init_vmware_nsx {
if ! is_set NSX_GATEWAY_NETWORK_CIDR; then if ! is_set NSX_GATEWAY_NETWORK_CIDR; then
NSX_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/} NSX_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/}
echo "The IP address to set on br-ex was not specified. " echo "The IP address to set on $PUBLIC_BRIDGE was not specified. "
echo "Defaulting to "$NSX_GATEWAY_NETWORK_CIDR echo "Defaulting to "$NSX_GATEWAY_NETWORK_CIDR
fi fi
# Make sure the interface is up, but not configured # Make sure the interface is up, but not configured
@ -42,14 +42,15 @@ function init_vmware_nsx {
# only with mac learning enabled, portsecurity and security profiles disabled # only with mac learning enabled, portsecurity and security profiles disabled
# The public bridge might not exist for the NSX plugin if Q_USE_DEBUG_COMMAND is off # The public bridge might not exist for the NSX plugin if Q_USE_DEBUG_COMMAND is off
# Try to create it anyway # Try to create it anyway
sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE sudo ovs-vsctl --may-exist add-br $PUBLIC_BRIDGE
sudo ovs-vsctl -- --may-exist add-port $PUBLIC_BRIDGE $NSX_GATEWAY_NETWORK_INTERFACE sudo ovs-vsctl --may-exist add-port $PUBLIC_BRIDGE $NSX_GATEWAY_NETWORK_INTERFACE
nsx_gw_net_if_mac=$(ip link show $NSX_GATEWAY_NETWORK_INTERFACE | awk '/ether/ {print $2}') nsx_gw_net_if_mac=$(ip link show $NSX_GATEWAY_NETWORK_INTERFACE | awk '/ether/ {print $2}')
sudo ip link set address $nsx_gw_net_if_mac dev $PUBLIC_BRIDGE sudo ip link set address $nsx_gw_net_if_mac dev $PUBLIC_BRIDGE
for address in $addresses; do for address in $addresses; do
sudo ip addr add dev $PUBLIC_BRIDGE $address sudo ip addr add dev $PUBLIC_BRIDGE $address
done done
sudo ip addr add dev $PUBLIC_BRIDGE $NSX_GATEWAY_NETWORK_CIDR sudo ip addr add dev $PUBLIC_BRIDGE $NSX_GATEWAY_NETWORK_CIDR
sudo ip link set $PUBLIC_BRIDGE up
} }
function install_vmware_nsx { function install_vmware_nsx {
@ -63,7 +64,7 @@ function start_vmware_nsx {
function stop_vmware_nsx { function stop_vmware_nsx {
if ! is_set NSX_GATEWAY_NETWORK_CIDR; then if ! is_set NSX_GATEWAY_NETWORK_CIDR; then
NSX_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/} NSX_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/}
echo "The IP address expected on br-ex was not specified. " echo "The IP address expected on $PUBLIC_BRIDGE was not specified. "
echo "Defaulting to "$NSX_GATEWAY_NETWORK_CIDR echo "Defaulting to "$NSX_GATEWAY_NETWORK_CIDR
fi fi
sudo ip addr del $NSX_GATEWAY_NETWORK_CIDR dev $PUBLIC_BRIDGE sudo ip addr del $NSX_GATEWAY_NETWORK_CIDR dev $PUBLIC_BRIDGE