Browse code

Merge "Run local script after nova cellsv2 is configured"

Zuul authored on 2018/03/05 22:01:25
Showing 1 changed files
... ...
@@ -1385,15 +1385,6 @@ run_phase stack extra
1385 1385
 merge_config_group $TOP_DIR/local.conf post-extra
1386 1386
 
1387 1387
 
1388
-# Run local script
1389
-# ----------------
1390
-
1391
-# Run ``local.sh`` if it exists to perform user-managed tasks
1392
-if [[ -x $TOP_DIR/local.sh ]]; then
1393
-    echo "Running user script $TOP_DIR/local.sh"
1394
-    $TOP_DIR/local.sh
1395
-fi
1396
-
1397 1388
 # Sanity checks
1398 1389
 # =============
1399 1390
 
... ...
@@ -1428,6 +1419,15 @@ if is_service_enabled n-api; then
1428 1428
     fi
1429 1429
 fi
1430 1430
 
1431
+# Run local script
1432
+# ----------------
1433
+
1434
+# Run ``local.sh`` if it exists to perform user-managed tasks
1435
+if [[ -x $TOP_DIR/local.sh ]]; then
1436
+    echo "Running user script $TOP_DIR/local.sh"
1437
+    $TOP_DIR/local.sh
1438
+fi
1439
+
1431 1440
 # Bash completion
1432 1441
 # ===============
1433 1442