openstack/devstack
Code Issues Proposed changes

lib/neutron: Add a utility method to add service plugin

Browse Source 
Partial-Bug: #1604664
Change-Id: I6d49ac188f7f1cfc8da314a26c9c5fc4b6d65bf4
This commit is contained in:
YAMAMOTO Takashi 2016-07-21 16:14:52 +09:00 committed by Ihar Hrachyshka
parent c0ef1bd05b
commit d9ec42028d
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/neutron
View File

@ -200,7 +200,7 @@ function configure_neutron_new {
if is_service_enabled neutron-l3; then if is_service_enabled neutron-l3; then
cp $NEUTRON_DIR/etc/l3_agent.ini.sample $NEUTRON_L3_CONF cp $NEUTRON_DIR/etc/l3_agent.ini.sample $NEUTRON_L3_CONF
iniset $NEUTRON_L3_CONF DEFAULT interface_driver $NEUTRON_AGENT iniset $NEUTRON_L3_CONF DEFAULT interface_driver $NEUTRON_AGENT
iniset $NEUTRON_CONF DEFAULT service_plugins router neutron_service_plugin_class_add router
iniset $NEUTRON_L3_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD" iniset $NEUTRON_L3_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD"
iniset $NEUTRON_L3_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL iniset $NEUTRON_L3_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
neutron_plugin_configure_l3_agent $NEUTRON_L3_CONF neutron_plugin_configure_l3_agent $NEUTRON_L3_CONF
@ -249,14 +249,8 @@ function configure_neutron_new {
source $TOP_DIR/lib/neutron_plugins/services/metering source $TOP_DIR/lib/neutron_plugins/services/metering
neutron_agent_metering_configure_common neutron_agent_metering_configure_common
neutron_agent_metering_configure_agent neutron_agent_metering_configure_agent
# TODO(sc68cal) hack because we don't pass around neutron_service_plugin_class_add metering
# $Q_SERVICE_PLUGIN_CLASSES like -legacy does
local plugins=""
plugins=$(iniget $NEUTRON_CONF DEFAULT service_plugins)
plugins+=",metering"
iniset $NEUTRON_CONF DEFAULT service_plugins $plugins
fi fi
} }
# configure_neutron_rootwrap() - configure Neutron's rootwrap # configure_neutron_rootwrap() - configure Neutron's rootwrap
@ -496,6 +490,16 @@ function _set_config_files {
} }
# neutron_service_plugin_class_add() - add service plugin class
function neutron_service_plugin_class_add_new {
local service_plugin_class=$1
local plugins=""
plugins=$(iniget $NEUTRON_CONF DEFAULT service_plugins)
plugins+=",${service_plugin_class}"
iniset $NEUTRON_CONF DEFAULT service_plugins $plugins
}
# Dispatch functions # Dispatch functions
# These are needed for compatibility between the old and new implementations # These are needed for compatibility between the old and new implementations
# where there are function name overlaps. These will be removed when # where there are function name overlaps. These will be removed when
@ -555,6 +559,15 @@ function install_neutron {
fi fi
} }
function neutron_service_plugin_class_add {
if is_neutron_legacy_enabled; then
# Call back to old function
_neutron_service_plugin_class_add "$@"
else
neutron_service_plugin_class_add_new "$@"
fi
}
function start_neutron { function start_neutron {
if is_neutron_legacy_enabled; then if is_neutron_legacy_enabled; then
# Call back to old function # Call back to old function