openstack
/
devstack
Code Issues Proposed changes

Merge "Load neutron-legacy only if enabled"

This commit is contained in:
Jenkins 2017-01-03 19:53:37 +00:00 committed by Gerrit Code Review
parent 2dcc9d09a4 c74315e055
commit de7b435b14
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/neutron
View File

@ -90,6 +90,10 @@ function is_neutron_legacy_enabled {
return 1 return 1
} }
if is_neutron_legacy_enabled; then
source $TOP_DIR/lib/neutron-legacy
fi
# cleanup_neutron() - Remove residual data files, anything left over from previous # cleanup_neutron() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up # runs that a clean run would need to clean up
function cleanup_neutron_new { function cleanup_neutron_new {
@ -568,6 +572,15 @@ function neutron_service_plugin_class_add {
fi fi
} }
function install_neutron_agent_packages {
if is_neutron_legacy_enabled; then
# Call back to old function
install_neutron_agent_packages_mutnauq "$@"
else
:
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

2
lib/neutron-legacy
View File

@ -423,7 +423,7 @@ function install_mutnauq {
} }
# install_neutron_agent_packages() - Collect source and prepare # install_neutron_agent_packages() - Collect source and prepare
function install_neutron_agent_packages { function install_neutron_agent_packages_mutnauq {
# radvd doesn't come with the OS. Install it if the l3 service is enabled. # radvd doesn't come with the OS. Install it if the l3 service is enabled.
if is_service_enabled q-l3; then if is_service_enabled q-l3; then
install_package radvd install_package radvd

1
stack.sh
View File

@ -573,7 +573,6 @@ source $TOP_DIR/lib/placement
source $TOP_DIR/lib/cinder source $TOP_DIR/lib/cinder
source $TOP_DIR/lib/swift source $TOP_DIR/lib/swift
source $TOP_DIR/lib/neutron source $TOP_DIR/lib/neutron
source $TOP_DIR/lib/neutron-legacy
source $TOP_DIR/lib/ldap source $TOP_DIR/lib/ldap
source $TOP_DIR/lib/dstat source $TOP_DIR/lib/dstat
source $TOP_DIR/lib/dlm source $TOP_DIR/lib/dlm

1
unstack.sh
View File

@ -67,7 +67,6 @@ source $TOP_DIR/lib/placement
source $TOP_DIR/lib/cinder source $TOP_DIR/lib/cinder
source $TOP_DIR/lib/swift source $TOP_DIR/lib/swift
source $TOP_DIR/lib/neutron source $TOP_DIR/lib/neutron
source $TOP_DIR/lib/neutron-legacy
source $TOP_DIR/lib/ldap source $TOP_DIR/lib/ldap
source $TOP_DIR/lib/dstat source $TOP_DIR/lib/dstat
source $TOP_DIR/lib/dlm source $TOP_DIR/lib/dlm