labs: split wait_for_shutdown off from boot

The boot command in config/scripts.* implies that osbash is going to
wait for the VM to shutdown before it proceeds. That means we currently
can't leave a VM running while booting another which is unfortunate when
the compute node needs access to controller services to build.

This patch splits the boot command into two separate commands, boot and
wait_for_shutdown, so we can omit wait_for_shutdown as desired.

All the configuration files are updated to keep build behavior unchanged,
with one exception: after the controller has been built, shutdown,
and snapshotted, it is booted again.

Change-Id: Ib6ba789f1b41909ef2398e9f78b343c41230e57b
Implements: blueprint openstack-training-labs

labs/config/scripts.compute

@@ -2,4 +2,5 @@
 scripts setup_nova_compute.sh
 scripts shutdown.sh
 boot
+wait_for_shutdown
 snapshot "pre-installed"

labs/config/scripts.controller

@@ -10,4 +10,6 @@ scripts setup_cinder_volumes.sh
 scripts setup_horizon.sh
 scripts shutdown.sh
 boot
+wait_for_shutdown
 snapshot "pre-installed"
+boot

labs/config/scripts.network

@@ -1,4 +1,5 @@
 # Scripts for network node
 scripts shutdown.sh
 boot
+wait_for_shutdown
 snapshot "pre-installed"

labs/config/scripts.nodeinit_osbash

@@ -4,4 +4,5 @@ osbash enable_vagrant_ssh_keys.sh
 #osbash wait_debug.sh
 scripts shutdown.sh
 boot
+wait_for_shutdown
 snapshot "Network configured."

labs/lib/osbash/functions.host

@@ -279,6 +279,9 @@ function autostart_from_config {
             # Format: snapshot "Description for snapshot"
             echo >&2 vm_snapshot "$NODE_NAME" "$field_2"
             vm_snapshot "$NODE_NAME" "$field_2"
+        elif [ "$field_1" == "wait_for_shutdown" ]; then
+            echo >&2 vm_wait_for_shutdown "$NODE_NAME"
+            vm_wait_for_shutdown "$NODE_NAME"
         else
             # Queue a script for autostart
             # Format: <dircode> <script_name>

labs/lib/osbash/virtualbox.install_node

@@ -33,7 +33,6 @@ function _vbox_boot_with_autostart {
 
     wait_for_autofiles
     echo >&2 "VM \"$VM\": autostart files executed"
-    vm_wait_for_shutdown "$VM"
 }
 
 function vm_build_node {