@@ -110,6 +110,15 @@ Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True}

 Q_USE_DEBUG_COMMAND=${Q_USE_DEBUG_COMMAND:-False}

 # The name of the default q-l3 router

 Q_ROUTER_NAME=${Q_ROUTER_NAME:-router1}

+

+# The next two variables are configured by plugin

+# e.g.  _configure_neutron_l3_agent or lib/neutron_plugins/*

+#

+# The plugin supports L3.

+Q_L3_ENABLED=${Q_L3_ENABLED:-False}

+# L3 routers exist per tenant

+Q_L3_ROUTER_PER_TENANT=${Q_L3_ROUTER_PER_TENANT:-False}

+

 # List of config file names in addition to the main plugin config file

 # See _configure_neutron_common() for details about setting it up

 declare -a Q_PLUGIN_EXTRA_CONF_FILES

@@ -14,6 +14,7 @@

 # - ``PUBLIC_NETWORK_NAME``

 # - ``Q_USE_NAMESPACE``

 # - ``Q_ROUTER_NAME``

+# - ``Q_L3_ENABLED``

 # - ``VIRT_DRIVER``

 # - ``LIBVIRT_TYPE``

 # - ``KEYSTONE_SERVICE_PROTOCOL``, ``KEYSTONE_SERVICE_HOST`` from lib/keystone

@@ -186,7 +187,7 @@ function configure_tempest() {

         tenant_networks_reachable=true

     fi

-    if is_service_enabled q-l3; then

+    if [ "$Q_L3_ENABLED" = "True" ]; then

         public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \

             awk '{print $2}')

         if [ "$Q_USE_NAMESPACE" == "False" ]; then