openstack/devstack
Code Issues Proposed changes

Merge "lib/neutron: Create initial topology only on controller node"

Browse Source
This commit is contained in:
Jenkins 2016-11-28 10:41:09 +00:00 committed by Gerrit Code Review
commit c0ef1bd05b
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/neutron
View File

@ -433,15 +433,17 @@ function start_neutron_new {
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"
fi fi
# XXX(sc68cal) - Here's where plugins can wire up their own networks instead if is_service_enabled neutron-api; then
# 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
create_neutron_initial_network
fi
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"

8
lib/neutron_plugins/services/l3
View File

@ -157,14 +157,6 @@ function _neutron_get_ext_gw_interface {
} }
function create_neutron_initial_network { function create_neutron_initial_network {
if ! is_service_enabled q-svc && ! is_service_enabled neutron-api; then
echo "Controller services not enabled. No networks configured!"
return
fi
if [[ "$NEUTRON_CREATE_INITIAL_NETWORKS" == "False" ]]; then
echo "Network creation disabled!"
return
fi
local project_id local project_id
project_id=$(openstack project list | grep " demo " | get_field 1) project_id=$(openstack project list | grep " demo " | get_field 1)
die_if_not_set $LINENO project_id "Failure retrieving project_id for demo" die_if_not_set $LINENO project_id "Failure retrieving project_id for demo"

5
stack.sh
View File

@ -1269,7 +1269,10 @@ if is_service_enabled neutron; then
start_neutron start_neutron
fi fi
# Once neutron agents are started setup initial network elements # Once neutron agents are started setup initial network elements
create_neutron_initial_network if is_service_enabled q-svc && [[ "$NEUTRON_CREATE_INITIAL_NETWORKS" == "True" ]]; then
echo_summary "Creating initial neutron network elements"
create_neutron_initial_network
fi
if is_service_enabled nova; then if is_service_enabled nova; then
echo_summary "Starting Nova" echo_summary "Starting Nova"