openstack/training-guides
Code Issues Proposed changes

Merge "labs: split wait_for_shutdown off from boot"

Browse Source
This commit is contained in:
Jenkins 2014-08-16 16:23:52 +00:00 committed by Gerrit Code Review
commit dcb47407a2
6 changed files with 8 additions and 1 deletions

1
labs/config/scripts.compute

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

2
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

1
labs/config/scripts.network

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

1
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."

3
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>

1
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 {