This reverts commit 7da968a8be03229cfa72b215b87f17e28e23a988.
Change-Id: I9ed28ccf6af611b280ada3420d7d2a833178fcac
... | ... |
@@ -199,7 +199,7 @@ TENANT_VLAN_RANGE=${TENANT_VLAN_RANGE:-} |
199 | 199 |
# agent, as described below. |
200 | 200 |
# |
201 | 201 |
# Example: ``PHYSICAL_NETWORK=default`` |
202 |
-PHYSICAL_NETWORK=${PHYSICAL_NETWORK:-} |
|
202 |
+PHYSICAL_NETWORK=${PHYSICAL_NETWORK:-public} |
|
203 | 203 |
|
204 | 204 |
# With the openvswitch agent, if using VLANs for tenant networks, |
205 | 205 |
# or if using flat or VLAN provider networks, set in ``localrc`` to |
... | ... |
@@ -209,7 +209,7 @@ PHYSICAL_NETWORK=${PHYSICAL_NETWORK:-} |
209 | 209 |
# port for external connectivity. |
210 | 210 |
# |
211 | 211 |
# Example: ``OVS_PHYSICAL_BRIDGE=br-eth1`` |
212 |
-OVS_PHYSICAL_BRIDGE=${OVS_PHYSICAL_BRIDGE:-} |
|
212 |
+OVS_PHYSICAL_BRIDGE=${OVS_PHYSICAL_BRIDGE:-br-ex} |
|
213 | 213 |
|
214 | 214 |
# With the linuxbridge agent, if using VLANs for tenant networks, |
215 | 215 |
# or if using flat or VLAN provider networks, set in ``localrc`` to |
... | ... |
@@ -17,6 +17,11 @@ IPV6_PROVIDER_NETWORK_GATEWAY=${IPV6_PROVIDER_NETWORK_GATEWAY:-} |
17 | 17 |
PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex} |
18 | 18 |
PUBLIC_BRIDGE_MTU=${PUBLIC_BRIDGE_MTU:-1500} |
19 | 19 |
|
20 |
+# If Q_ASSIGN_GATEWAY_TO_PUBLIC_BRIDGE=True, assign the gateway IP of the public |
|
21 |
+# subnet to the public bridge interface even if Q_USE_PROVIDERNET_FOR_PUBLIC is |
|
22 |
+# used. |
|
23 |
+Q_ASSIGN_GATEWAY_TO_PUBLIC_BRIDGE=${Q_ASSIGN_GATEWAY_TO_PUBLIC_BRIDGE:-True} |
|
24 |
+ |
|
20 | 25 |
# If Q_USE_PUBLIC_VETH=True, create and use a veth pair instead of |
21 | 26 |
# PUBLIC_BRIDGE. This is intended to be used with |
22 | 27 |
# Q_USE_PROVIDERNET_FOR_PUBLIC=True. |
... | ... |
@@ -51,7 +56,7 @@ Q_L3_ROUTER_PER_TENANT=${Q_L3_ROUTER_PER_TENANT:-True} |
51 | 51 |
# Q_USE_PROVIDERNET_FOR_PUBLIC=True |
52 | 52 |
# PUBLIC_PHYSICAL_NETWORK=public |
53 | 53 |
# OVS_BRIDGE_MAPPINGS=public:br-ex |
54 |
-Q_USE_PROVIDERNET_FOR_PUBLIC=${Q_USE_PROVIDERNET_FOR_PUBLIC:-False} |
|
54 |
+Q_USE_PROVIDERNET_FOR_PUBLIC=${Q_USE_PROVIDERNET_FOR_PUBLIC:-True} |
|
55 | 55 |
PUBLIC_PHYSICAL_NETWORK=${PUBLIC_PHYSICAL_NETWORK:-public} |
56 | 56 |
|
57 | 57 |
# Generate 40-bit IPv6 Global ID to comply with RFC 4193 |
... | ... |
@@ -327,7 +332,7 @@ function _neutron_configure_router_v4 { |
327 | 327 |
local cidr_len=${FLOATING_RANGE#*/} |
328 | 328 |
local testcmd="ip -o link | grep -q $ext_gw_interface" |
329 | 329 |
test_with_retry "$testcmd" "$ext_gw_interface creation failed" |
330 |
- 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 |
|
330 |
+ 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" || $Q_ASSIGN_GATEWAY_TO_PUBLIC_BRIDGE == "True" ) ]]; then |
|
331 | 331 |
sudo ip addr add $ext_gw_ip/$cidr_len dev $ext_gw_interface |
332 | 332 |
sudo ip link set $ext_gw_interface up |
333 | 333 |
fi |