From 0fc1cc29ac5d9aa88e47611de72f3a98f14bf242 Mon Sep 17 00:00:00 2001 From: Henry Gessau Date: Sun, 6 Jul 2014 22:54:34 -0400 Subject: [PATCH] Use one name for neutron database after healing Now that the Neutron database is healed we no longer need a plugin-specific name for it. Related Blueprint: db-migration-refactor Change-Id: If25e77444f115817e5570bb447bde5b9c8d6e686 --- lib/neutron | 2 ++ lib/neutron_plugins/README.md | 2 +- lib/neutron_plugins/bigswitch_floodlight | 1 - lib/neutron_plugins/brocade | 1 - lib/neutron_plugins/cisco | 1 - lib/neutron_plugins/embrane | 1 - lib/neutron_plugins/ibm | 1 - lib/neutron_plugins/linuxbridge | 1 - lib/neutron_plugins/midonet | 1 - lib/neutron_plugins/ml2 | 1 - lib/neutron_plugins/nec | 1 - lib/neutron_plugins/nuage | 1 - lib/neutron_plugins/oneconvergence | 1 - lib/neutron_plugins/openvswitch | 1 - lib/neutron_plugins/plumgrid | 1 - lib/neutron_plugins/ryu | 1 - lib/neutron_plugins/vmware_nsx | 1 - 17 files changed, 3 insertions(+), 16 deletions(-) diff --git a/lib/neutron b/lib/neutron index 8b883b1e5a..eeb29bd582 100644 --- a/lib/neutron +++ b/lib/neutron @@ -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 diff --git a/lib/neutron_plugins/README.md b/lib/neutron_plugins/README.md index be8fd96677..7192a051b4 100644 --- a/lib/neutron_plugins/README.md +++ b/lib/neutron_plugins/README.md @@ -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`` diff --git a/lib/neutron_plugins/bigswitch_floodlight b/lib/neutron_plugins/bigswitch_floodlight index efdd9ef794..9e84f2e75a 100644 --- a/lib/neutron_plugins/bigswitch_floodlight +++ b/lib/neutron_plugins/bigswitch_floodlight @@ -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} diff --git a/lib/neutron_plugins/brocade b/lib/neutron_plugins/brocade index e4cc754039..511fb71d61 100644 --- a/lib/neutron_plugins/brocade +++ b/lib/neutron_plugins/brocade @@ -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" } diff --git a/lib/neutron_plugins/cisco b/lib/neutron_plugins/cisco index dccf4003c3..da90ee32ad 100644 --- a/lib/neutron_plugins/cisco +++ b/lib/neutron_plugins/cisco @@ -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 { diff --git a/lib/neutron_plugins/embrane b/lib/neutron_plugins/embrane index cce108a4a1..7dafdc001f 100644 --- a/lib/neutron_plugins/embrane +++ b/lib/neutron_plugins/embrane @@ -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" } diff --git a/lib/neutron_plugins/ibm b/lib/neutron_plugins/ibm index 3aef9d0359..39b00401ae 100644 --- a/lib/neutron_plugins/ibm +++ b/lib/neutron_plugins/ibm @@ -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" } diff --git a/lib/neutron_plugins/linuxbridge b/lib/neutron_plugins/linuxbridge index 113a7dfda6..5f989ae0ad 100644 --- a/lib/neutron_plugins/linuxbridge +++ b/lib/neutron_plugins/linuxbridge @@ -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" } diff --git a/lib/neutron_plugins/midonet b/lib/neutron_plugins/midonet index c5373d656f..6ccd502d97 100644 --- a/lib/neutron_plugins/midonet +++ b/lib/neutron_plugins/midonet @@ -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" } diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2 index 8e131bbb94..3ea141e6c4 100644 --- a/lib/neutron_plugins/ml2 +++ b/lib/neutron_plugins/ml2 @@ -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. diff --git a/lib/neutron_plugins/nec b/lib/neutron_plugins/nec index d76f7d4aaf..f8d98c35fe 100644 --- a/lib/neutron_plugins/nec +++ b/lib/neutron_plugins/nec @@ -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" } diff --git a/lib/neutron_plugins/nuage b/lib/neutron_plugins/nuage index 86f09d2b54..52d85a26cc 100644 --- a/lib/neutron_plugins/nuage +++ b/lib/neutron_plugins/nuage @@ -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 diff --git a/lib/neutron_plugins/oneconvergence b/lib/neutron_plugins/oneconvergence index 06f1eee8c7..e5f0d71200 100644 --- a/lib/neutron_plugins/oneconvergence +++ b/lib/neutron_plugins/oneconvergence @@ -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 diff --git a/lib/neutron_plugins/openvswitch b/lib/neutron_plugins/openvswitch index fc81092682..c468132bbb 100644 --- a/lib/neutron_plugins/openvswitch +++ b/lib/neutron_plugins/openvswitch @@ -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" } diff --git a/lib/neutron_plugins/plumgrid b/lib/neutron_plugins/plumgrid index 178bca7dc2..37b9e4cc34 100644 --- a/lib/neutron_plugins/plumgrid +++ b/lib/neutron_plugins/plumgrid @@ -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} diff --git a/lib/neutron_plugins/ryu b/lib/neutron_plugins/ryu index ceb89faf6e..f45a7972e8 100644 --- a/lib/neutron_plugins/ryu +++ b/lib/neutron_plugins/ryu @@ -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" } diff --git a/lib/neutron_plugins/vmware_nsx b/lib/neutron_plugins/vmware_nsx index c7672dbb4a..5802ebf7e0 100644 --- a/lib/neutron_plugins/vmware_nsx +++ b/lib/neutron_plugins/vmware_nsx @@ -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" }