openstack/devstack
Code Issues Proposed changes

Merge "lib/neutron: Create initial networks regardless of neutron-l3"

Browse Source
This commit is contained in:
Jenkins 2016-08-09 14:13:59 +00:00 committed by Gerrit Code Review
commit 881f3f15ab
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/neutron
View File

@ -428,16 +428,16 @@ function start_neutron_new {
fi fi
if is_service_enabled neutron-l3; then if is_service_enabled neutron-l3; then
run_process neutron-l3 "$NEUTRON_BIN_DIR/$NEUTRON_L3_BINARY $NEUTRON_CONFIG_ARG" run_process neutron-l3 "$NEUTRON_BIN_DIR/$NEUTRON_L3_BINARY $NEUTRON_CONFIG_ARG"
# XXX(sc68cal) - Here's where plugins can wire up their own networks instead fi
# of the code in lib/neutron_plugins/services/l3 # XXX(sc68cal) - Here's where plugins can wire up their own networks instead
if type -p neutron_plugin_create_initial_networks > /dev/null; then # of the code in lib/neutron_plugins/services/l3
neutron_plugin_create_initial_networks if type -p neutron_plugin_create_initial_networks > /dev/null; then
else neutron_plugin_create_initial_networks
# XXX(sc68cal) Load up the built in Neutron networking code and build a topology else
source $TOP_DIR/lib/neutron_plugins/services/l3 # XXX(sc68cal) Load up the built in Neutron networking code and build a topology
# Create the networks using servic source $TOP_DIR/lib/neutron_plugins/services/l3
create_neutron_initial_network # Create the networks using servic
fi create_neutron_initial_network
fi fi
if is_service_enabled neutron-metadata-agent; then if is_service_enabled neutron-metadata-agent; then
run_process neutron-metadata-agent "$NEUTRON_BIN_DIR/$NEUTRON_META_BINARY $NEUTRON_CONFIG_ARG" run_process neutron-metadata-agent "$NEUTRON_BIN_DIR/$NEUTRON_META_BINARY $NEUTRON_CONFIG_ARG"