@@ -115,6 +115,13 @@ Q_ROUTER_NAME=${Q_ROUTER_NAME:-router1}

 # nova vif driver that all plugins should use

 NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}

+# 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

@@ -15,6 +15,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

@@ -202,7 +203,7 @@ function configure_tempest() {

     ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}

-    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