Browse code

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

Jenkins authored on 2013/12/13 11:03:18
Showing 1 changed files
... ...
@@ -33,7 +33,7 @@ function init_nicira() {
33 33
         echo "Defaulting to "$NVP_GATEWAY_NETWORK_CIDR
34 34
     fi
35 35
     # Make sure the interface is up, but not configured
36
-    sudo ip link dev $NVP_GATEWAY_NETWORK_INTERFACE set up
36
+    sudo ip link set $NVP_GATEWAY_NETWORK_INTERFACE up
37 37
     # Save and then flush the IP addresses on the interface
38 38
     addresses=$(ip addr show dev $NVP_GATEWAY_NETWORK_INTERFACE | grep inet | awk {'print $2'})
39 39
     sudo ip addr flush $NVP_GATEWAY_NETWORK_INTERFACE
... ...
@@ -45,7 +45,7 @@ function init_nicira() {
45 45
     sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE
46 46
     sudo ovs-vsctl -- --may-exist add-port $PUBLIC_BRIDGE $NVP_GATEWAY_NETWORK_INTERFACE
47 47
     nvp_gw_net_if_mac=$(ip link show $NVP_GATEWAY_NETWORK_INTERFACE | awk '/ether/ {print $2}')
48
-    sudo ip link dev $PUBLIC_BRIDGE set address $nvp_gw_net_if_mac
48
+    sudo ip link set address $nvp_gw_net_if_mac dev $PUBLIC_BRIDGE
49 49
     for address in $addresses; do
50 50
         sudo ip addr add dev $PUBLIC_BRIDGE $address
51 51
     done