openstack/devstack
Code Issues Proposed changes

Merge "Neutron: check if q-l3 or neutron-l3 is enabled"

Browse Source
This commit is contained in:
Jenkins
2016-06-27 21:39:08 +00:00
committed by Gerrit Code Review
parent 839ea5a222 d00cbb77b1
commit 2fec2fe732
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron_plugins/services/l3
View File

@@ -289,7 +289,7 @@ function _neutron_configure_router_v4 {
neutron --os-cloud devstack-admin --os-region "$REGION_NAME" router-gateway-set $ROUTER_ID $EXT_NET_ID
# This logic is specific to using the l3-agent for layer 3
if is_service_enabled q-l3; then
if is_service_enabled q-l3 || is_service_enabled neutron-l3; then
# Configure and enable public bridge
local ext_gw_interface="none"
if is_neutron_ovs_base_plugin; then
@@ -334,7 +334,7 @@ function _neutron_configure_router_v6 {
fi
# This logic is specific to using the l3-agent for layer 3
if is_service_enabled q-l3; then
if is_service_enabled q-l3 || is_service_enabled neutron-l3; then
# Ensure IPv6 forwarding is enabled on the host
sudo sysctl -w net.ipv6.conf.all.forwarding=1
# Configure and enable public bridge