From d00cbb77b166e222fdb5adf2aa5ff7dff6294ca4 Mon Sep 17 00:00:00 2001 From: "Sean M. Collins" Date: Mon, 20 Jun 2016 13:53:44 -0400 Subject: [PATCH] Neutron: check if q-l3 or neutron-l3 is enabled Change-Id: I7aff59fdf0fd75e134d2ae3ba8b7d63db98cc5ed --- lib/neutron_plugins/services/l3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/neutron_plugins/services/l3 b/lib/neutron_plugins/services/l3 index 0f0ed216d0..61f0d6c099 100644 --- a/lib/neutron_plugins/services/l3 +++ b/lib/neutron_plugins/services/l3 @@ -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