openstack/training-guides
Code Issues Proposed changes

Merge "labs: add snapshot_cycle command"

Browse Source
This commit is contained in:
Jenkins 2014-08-26 21:42:03 +00:00 committed by Gerrit Code Review
commit 3467f75b17
4 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
labs/config/scripts.compute
View File

@ -4,13 +4,7 @@ scripts etc_hosts.sh
osbash enable_vagrant_ssh_keys.sh
#osbash wait_debug.sh
# Using scripts/osbash/shutdown.sh because we want Vagrant to ignore this
osbash shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "network_configured"
cmd snapshot_cycle "network_configured"
scripts setup_nova_compute.sh
scripts setup_neutron_compute.sh
scripts shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "pre-installed"
cmd snapshot_cycle "pre-installed"

10
labs/config/scripts.controller
View File

@ -4,10 +4,7 @@ scripts etc_hosts.sh
osbash enable_vagrant_ssh_keys.sh
#osbash wait_debug.sh
# Using scripts/osbash/shutdown.sh because we want Vagrant to ignore this
osbash shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "network_configured"
cmd snapshot_cycle "network_configured"
scripts apt_install_mysql.sh
scripts install_rabbitmq.sh
scripts setup_keystone.sh
@ -20,8 +17,5 @@ scripts setup_horizon.sh
scripts config_external_network.sh
scripts config_demo_user.sh
scripts config_tenant_network.sh
scripts shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "pre-installed"
cmd snapshot_cycle "pre-installed"
cmd boot

10
labs/config/scripts.network
View File

@ -4,12 +4,6 @@ scripts etc_hosts.sh
osbash enable_vagrant_ssh_keys.sh
#osbash wait_debug.sh
# Using scripts/osbash/shutdown.sh because we want Vagrant to ignore this
osbash shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "network_configured"
cmd snapshot_cycle "network_configured"
scripts setup_neutron_network.sh
scripts shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "pre-installed"
cmd snapshot_cycle "pre-installed"

9
labs/lib/osbash/functions.host
View File

@ -276,6 +276,15 @@ function command_from_config {
echo >&2 vm_wait_for_shutdown "$NODE_NAME"
vm_wait_for_shutdown "$NODE_NAME"
;;
snapshot_cycle)
# comprises shutdown, boot, wait_for_shutdown, snapshot
local shot_name=${cmd_string[1]}
echo >&2 snapshot_cycle "$NODE_NAME" "$shot_name"
_autostart_queue "osbash/shutdown.sh"
_vbox_boot_with_autostart "$NODE_NAME" "$VM_SSH_PORT"
vm_wait_for_shutdown "$NODE_NAME"
vm_snapshot "$NODE_NAME" "$shot_name"
;;
init_node)
echo >&2 vm_init_node "$NODE_NAME"
vm_init_node "$NODE_NAME"