@@ -85,6 +85,8 @@ NEUTRON_CONF_DIR=/etc/neutron

 NEUTRON_CONF=$NEUTRON_CONF_DIR/neutron.conf

 export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}

+# Default name for Neutron database

+Q_DB_NAME=${Q_DB_NAME:-neutron}

 # Default Neutron Plugin

 Q_PLUGIN=${Q_PLUGIN:-ml2}

 # Default Neutron Port

@@ -25,7 +25,7 @@ functions

   install_package bridge-utils

 * ``neutron_plugin_configure_common`` :

   set plugin-specific variables, ``Q_PLUGIN_CONF_PATH``, ``Q_PLUGIN_CONF_FILENAME``,

-  ``Q_DB_NAME``, ``Q_PLUGIN_CLASS``

+  ``Q_PLUGIN_CLASS``

 * ``neutron_plugin_configure_debug_command``

 * ``neutron_plugin_configure_dhcp_agent``

 * ``neutron_plugin_configure_l3_agent``

@@ -19,7 +19,6 @@ function neutron_plugin_install_agent_packages {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/bigswitch

     Q_PLUGIN_CONF_FILENAME=restproxy.ini

-    Q_DB_NAME="restproxy_neutron"

     Q_PLUGIN_CLASS="neutron.plugins.bigswitch.plugin.NeutronRestProxyV2"

     BS_FL_CONTROLLERS_PORT=${BS_FL_CONTROLLERS_PORT:-localhost:80}

     BS_FL_CONTROLLER_TIMEOUT=${BS_FL_CONTROLLER_TIMEOUT:-10}

@@ -20,7 +20,6 @@ function neutron_plugin_install_agent_packages {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/brocade

     Q_PLUGIN_CONF_FILENAME=brocade.ini

-    Q_DB_NAME="brcd_neutron"

     Q_PLUGIN_CLASS="neutron.plugins.brocade.NeutronPlugin.BrocadePluginV2"

 }

@@ -197,7 +197,6 @@ function neutron_plugin_configure_common {

         Q_PLUGIN_CONF_FILENAME=cisco_plugins.ini

     fi

     Q_PLUGIN_CLASS="neutron.plugins.cisco.network_plugin.PluginV2"

-    Q_DB_NAME=cisco_neutron

 }

 function neutron_plugin_configure_debug_command {

@@ -18,7 +18,6 @@ save_function neutron_plugin_configure_service _neutron_plugin_configure_service

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/embrane

     Q_PLUGIN_CONF_FILENAME=heleos_conf.ini

-    Q_DB_NAME="ovs_neutron"

     Q_PLUGIN_CLASS="neutron.plugins.embrane.plugins.embrane_ovs_plugin.EmbraneOvsPlugin"

 }

@@ -60,7 +60,6 @@ function is_neutron_ovs_base_plugin {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/ibm

     Q_PLUGIN_CONF_FILENAME=sdnve_neutron_plugin.ini

-    Q_DB_NAME="sdnve_neutron"

     Q_PLUGIN_CLASS="neutron.plugins.ibm.sdnve_neutron_plugin.SdnvePluginV2"

 }

@@ -10,7 +10,6 @@ source $TOP_DIR/lib/neutron_plugins/linuxbridge_agent

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/linuxbridge

     Q_PLUGIN_CONF_FILENAME=linuxbridge_conf.ini

-    Q_DB_NAME="neutron_linux_bridge"

     Q_PLUGIN_CLASS="neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2"

 }

@@ -26,7 +26,6 @@ function neutron_plugin_install_agent_packages {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/midonet

     Q_PLUGIN_CONF_FILENAME=midonet.ini

-    Q_DB_NAME="neutron_midonet"

     Q_PLUGIN_CLASS="neutron.plugins.midonet.plugin.MidonetPluginV2"

 }

@@ -50,7 +50,6 @@ function populate_ml2_config {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/ml2

     Q_PLUGIN_CONF_FILENAME=ml2_conf.ini

-    Q_DB_NAME="neutron_ml2"

     Q_PLUGIN_CLASS="neutron.plugins.ml2.plugin.Ml2Plugin"

     # The ML2 plugin delegates L3 routing/NAT functionality to

     # the L3 service plugin which must therefore be specified.

@@ -39,7 +39,6 @@ function neutron_plugin_install_agent_packages {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/nec

     Q_PLUGIN_CONF_FILENAME=nec.ini

-    Q_DB_NAME="neutron_nec"

     Q_PLUGIN_CLASS="neutron.plugins.nec.nec_plugin.NECPluginV2"

 }

@@ -20,7 +20,6 @@ function neutron_plugin_install_agent_packages {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/nuage

     Q_PLUGIN_CONF_FILENAME=nuage_plugin.ini

-    Q_DB_NAME="nuage_neutron"

     Q_PLUGIN_CLASS="neutron.plugins.nuage.plugin.NuagePlugin"

     Q_PLUGIN_EXTENSIONS_PATH=neutron/plugins/nuage/extensions

     #Nuage specific Neutron defaults. Actual value must be set and sourced

@@ -19,7 +19,6 @@ function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/oneconvergence

     Q_PLUGIN_CONF_FILENAME=nvsdplugin.ini

     Q_PLUGIN_CLASS="neutron.plugins.oneconvergence.plugin.OneConvergencePluginV2"

-    Q_DB_NAME='oc_nvsd_neutron'

 }

 # Configure plugin specific information

@@ -10,7 +10,6 @@ source $TOP_DIR/lib/neutron_plugins/openvswitch_agent

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/openvswitch

     Q_PLUGIN_CONF_FILENAME=ovs_neutron_plugin.ini

-    Q_DB_NAME="ovs_neutron"

     Q_PLUGIN_CLASS="neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2"

 }

@@ -17,7 +17,6 @@ function neutron_plugin_setup_interface_driver {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/plumgrid

     Q_PLUGIN_CONF_FILENAME=plumgrid.ini

-    Q_DB_NAME="plumgrid_neutron"

     Q_PLUGIN_CLASS="neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2"

     PLUMGRID_DIRECTOR_IP=${PLUMGRID_DIRECTOR_IP:-localhost}

     PLUMGRID_DIRECTOR_PORT=${PLUMGRID_DIRECTOR_PORT:-7766}

@@ -25,7 +25,6 @@ function neutron_plugin_install_agent_packages {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/ryu

     Q_PLUGIN_CONF_FILENAME=ryu.ini

-    Q_DB_NAME="ovs_neutron"

     Q_PLUGIN_CLASS="neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2"

 }

@@ -40,7 +40,6 @@ function neutron_plugin_install_agent_packages {

 function neutron_plugin_configure_common {

     Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware

     Q_PLUGIN_CONF_FILENAME=nsx.ini

-    Q_DB_NAME="neutron_nsx"

     Q_PLUGIN_CLASS="neutron.plugins.vmware.plugin.NsxPlugin"

 }