1. devstack
  2. Commit 909fa8f49e0e253009be1299a4a067a22d80bb9b
Browse code

Fix Q_USE_PUBLIC_VETH regression

A recently merged change Ie35cb537bb670c4773598b8db29877fb8a12ff50
and I71e2594288bae1a71dc2c8c3fb350b913dbd5e2c broke Q_USE_PUBLIC_VETH.
This commit fixes the regression.

Closes-Bug: #1436637
Change-Id: I1447bf98607143ba4954ce5ec3ed94010320baa5

YAMAMOTO Takashi authored on 2015/03/27 10:56:16
Showing 1 changed files
lib/neutron-legacy
History View file @ 909fa8f
... ... 
@@ -1263,7 +1263,7 @@ function _neutron_configure_router_v4 {
1263 1263 
         if is_neutron_ovs_base_plugin && [[ "$Q_USE_NAMESPACE" = "True" ]]; then
1264 1264 
             local ext_gw_interface=$(_neutron_get_ext_gw_interface)
1265 1265 
             local cidr_len=${FLOATING_RANGE#*/}
1266 
-            if [[ $(ip addr show dev $ext_gw_interface | grep -c $ext_gw_ip) == 0 && $Q_USE_PROVIDERNET_FOR_PUBLIC == "False" ]]; then
1266 
+            if [[ $(ip addr show dev $ext_gw_interface | grep -c $ext_gw_ip) == 0 && ( $Q_USE_PROVIDERNET_FOR_PUBLIC == "False" || $Q_USE_PUBLIC_VETH == "True" ) ]]; then
1267 1267 
                 sudo ip addr add $ext_gw_ip/$cidr_len dev $ext_gw_interface
1268 1268 
                 sudo ip link set $ext_gw_interface up
1269 1269 
             fi