From 6372b4e5e03fcd42d4ca8b99cd3d76674b183e6a Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Sat, 9 Aug 2014 17:21:26 +0200
Subject: [PATCH] labs: make use of snapshot functionality

This changeset pushes some of the code from virtualbox.install_node
to the configuration files.

In doing so, the patch demonstrates how additional snapshots can be
configured just by editing config/scripts.*.

Implements: blueprint openstack-training-labs
Change-Id: I1f5f6d5aa3842da8fa94bd1a10a753bb80db023b
---
 labs/config/scripts.compute             | 3 +++
 labs/config/scripts.controller          | 3 +++
 labs/config/scripts.network             | 3 +++
 labs/config/scripts.nodeinit_osbash     | 2 ++
 labs/lib/osbash/virtualbox.install_node | 5 -----
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/labs/config/scripts.compute b/labs/config/scripts.compute
index 851e4543..225fb7c0 100644
--- a/labs/config/scripts.compute
+++ b/labs/config/scripts.compute
@@ -1 +1,4 @@
 # Scripts for compute node
+scripts shutdown.sh
+boot
+snapshot "pre-installed"
diff --git a/labs/config/scripts.controller b/labs/config/scripts.controller
index 687f2f0a..a93abe0e 100644
--- a/labs/config/scripts.controller
+++ b/labs/config/scripts.controller
@@ -2,3 +2,6 @@
 scripts apt_install_mysql.sh
 scripts setup_keystone.sh
 scripts setup_glance.sh
+scripts shutdown.sh
+boot
+snapshot "pre-installed"
diff --git a/labs/config/scripts.network b/labs/config/scripts.network
index 40fbcb48..8c71787d 100644
--- a/labs/config/scripts.network
+++ b/labs/config/scripts.network
@@ -1 +1,4 @@
 # Scripts for network node
+scripts shutdown.sh
+boot
+snapshot "pre-installed"
diff --git a/labs/config/scripts.nodeinit_osbash b/labs/config/scripts.nodeinit_osbash
index afeb90ec..42e24c3a 100644
--- a/labs/config/scripts.nodeinit_osbash
+++ b/labs/config/scripts.nodeinit_osbash
@@ -3,3 +3,5 @@ scripts etc_hosts.sh
 osbash enable_vagrant_ssh_keys.sh
 #osbash wait_debug.sh
 scripts shutdown.sh
+boot
+snapshot "Network configured."
diff --git a/labs/lib/osbash/virtualbox.install_node b/labs/lib/osbash/virtualbox.install_node
index ebbe3e4e..b401de9c 100644
--- a/labs/lib/osbash/virtualbox.install_node
+++ b/labs/lib/osbash/virtualbox.install_node
@@ -69,14 +69,9 @@ function vm_build_node {
     autostart_and_rename osbash init_xxx_node.sh "init_${NODE_NAME}_node.sh"
     autostart_from_config scripts.nodeinit_osbash
 
-    _vbox_boot_with_autostart "$NODE_NAME" "$VM_SSH_PORT"
-    vm_snapshot "$NODE_NAME" "network_configured"
     #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     autostart_reset
     autostart_from_config "scripts.$NODE_NAME"
-    autostart scripts shutdown.sh
-    _vbox_boot_with_autostart "$NODE_NAME" "$VM_SSH_PORT"
-    vm_snapshot "$NODE_NAME" "pre-installed"
     #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     ${WBATCH:-:} wbatch_end_file