Browse code

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

Jenkins authored on 2016/08/09 23:13:59
Showing 1 changed files
... ...
@@ -428,16 +428,16 @@ function start_neutron_new {
428 428
     fi
429 429
     if is_service_enabled neutron-l3; then
430 430
         run_process neutron-l3 "$NEUTRON_BIN_DIR/$NEUTRON_L3_BINARY $NEUTRON_CONFIG_ARG"
431
-        # XXX(sc68cal) - Here's where plugins can wire up their own networks instead
432
-        # of the code in lib/neutron_plugins/services/l3
433
-        if type -p neutron_plugin_create_initial_networks > /dev/null; then
434
-            neutron_plugin_create_initial_networks
435
-        else
436
-            # XXX(sc68cal) Load up the built in Neutron networking code and build a topology
437
-            source $TOP_DIR/lib/neutron_plugins/services/l3
438
-            # Create the networks using servic
439
-            create_neutron_initial_network
440
-        fi
431
+    fi
432
+    # XXX(sc68cal) - Here's where plugins can wire up their own networks instead
433
+    # of the code in lib/neutron_plugins/services/l3
434
+    if type -p neutron_plugin_create_initial_networks > /dev/null; then
435
+        neutron_plugin_create_initial_networks
436
+    else
437
+        # XXX(sc68cal) Load up the built in Neutron networking code and build a topology
438
+        source $TOP_DIR/lib/neutron_plugins/services/l3
439
+        # Create the networks using servic
440
+        create_neutron_initial_network
441 441
     fi
442 442
     if is_service_enabled neutron-metadata-agent; then
443 443
         run_process neutron-metadata-agent "$NEUTRON_BIN_DIR/$NEUTRON_META_BINARY $NEUTRON_CONFIG_ARG"