Merge "Update to PLUMgrid plugin configuration"

This commit is contained in:
Jenkins 2013-08-04 16:13:32 +00:00 committed by Gerrit Code Review
commit e024bee3ed

View File

@ -21,7 +21,7 @@ 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_nos_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2"
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}
}
@ -35,6 +35,16 @@ function neutron_plugin_configure_debug_command() {
:
}
function is_neutron_ovs_base_plugin() {
# False
return 1
}
function has_neutron_plugin_security_group() {
# False
return 1
}
function neutron_plugin_check_adv_test_requirements() {
is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
}