Closes-Bug: #1604768
Change-Id: I699977930675512e9767a90f317fc0faa1ea9901
... | ... |
@@ -425,16 +425,16 @@ function start_neutron_new { |
425 | 425 |
fi |
426 | 426 |
if is_service_enabled neutron-l3; then |
427 | 427 |
run_process neutron-l3 "$NEUTRON_BIN_DIR/$NEUTRON_L3_BINARY $NEUTRON_CONFIG_ARG" |
428 |
- # XXX(sc68cal) - Here's where plugins can wire up their own networks instead |
|
429 |
- # of the code in lib/neutron_plugins/services/l3 |
|
430 |
- if type -p neutron_plugin_create_initial_networks > /dev/null; then |
|
431 |
- neutron_plugin_create_initial_networks |
|
432 |
- else |
|
433 |
- # XXX(sc68cal) Load up the built in Neutron networking code and build a topology |
|
434 |
- source $TOP_DIR/lib/neutron_plugins/services/l3 |
|
435 |
- # Create the networks using servic |
|
436 |
- create_neutron_initial_network |
|
437 |
- fi |
|
428 |
+ fi |
|
429 |
+ # XXX(sc68cal) - Here's where plugins can wire up their own networks instead |
|
430 |
+ # of the code in lib/neutron_plugins/services/l3 |
|
431 |
+ if type -p neutron_plugin_create_initial_networks > /dev/null; then |
|
432 |
+ neutron_plugin_create_initial_networks |
|
433 |
+ else |
|
434 |
+ # XXX(sc68cal) Load up the built in Neutron networking code and build a topology |
|
435 |
+ source $TOP_DIR/lib/neutron_plugins/services/l3 |
|
436 |
+ # Create the networks using servic |
|
437 |
+ create_neutron_initial_network |
|
438 | 438 |
fi |
439 | 439 |
if is_service_enabled neutron-metadata-agent; then |
440 | 440 |
run_process neutron-metadata-agent "$NEUTRON_BIN_DIR/$NEUTRON_META_BINARY $NEUTRON_CONFIG_ARG" |