openstack/devstack
Code Issues Proposed changes

Merge "Neutron/NVP plugin: fix 'ip link' usage"

Browse Source
This commit is contained in:
Jenkins 2013-12-13 02:03:18 +00:00 committed by Gerrit Code Review
commit 7f285840dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron_thirdparty/nicira vendored
View File

@ -33,7 +33,7 @@ function init_nicira() {
echo "Defaulting to "$NVP_GATEWAY_NETWORK_CIDR echo "Defaulting to "$NVP_GATEWAY_NETWORK_CIDR
fi fi
# Make sure the interface is up, but not configured # Make sure the interface is up, but not configured
sudo ip link dev $NVP_GATEWAY_NETWORK_INTERFACE set up sudo ip link set $NVP_GATEWAY_NETWORK_INTERFACE up
# Save and then flush the IP addresses on the interface # Save and then flush the IP addresses on the interface
addresses=$(ip addr show dev $NVP_GATEWAY_NETWORK_INTERFACE | grep inet | awk {'print $2'}) addresses=$(ip addr show dev $NVP_GATEWAY_NETWORK_INTERFACE | grep inet | awk {'print $2'})
sudo ip addr flush $NVP_GATEWAY_NETWORK_INTERFACE sudo ip addr flush $NVP_GATEWAY_NETWORK_INTERFACE
@ -45,7 +45,7 @@ function init_nicira() {
sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE
sudo ovs-vsctl -- --may-exist add-port $PUBLIC_BRIDGE $NVP_GATEWAY_NETWORK_INTERFACE sudo ovs-vsctl -- --may-exist add-port $PUBLIC_BRIDGE $NVP_GATEWAY_NETWORK_INTERFACE
nvp_gw_net_if_mac=$(ip link show $NVP_GATEWAY_NETWORK_INTERFACE | awk '/ether/ {print $2}') nvp_gw_net_if_mac=$(ip link show $NVP_GATEWAY_NETWORK_INTERFACE | awk '/ether/ {print $2}')
sudo ip link dev $PUBLIC_BRIDGE set address $nvp_gw_net_if_mac sudo ip link set address $nvp_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