From 578c593607de5ef97c52e993581162bfd112f5d8 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Fri, 3 Oct 2014 12:02:10 +0200
Subject: [PATCH] labs: take additional snapshots of controller node

Take a snapshot of the controller VM after installing the compute and
network nodes.

The configuration of compute and network nodes is largely saved in the
database running on the controller node, but until now these database
changes were not part of any snapshots. With this changeset, resetting
all nodes to the most recent snapshots restores a working cluster.

Change-Id: Ifd2ca144d176280bc6677a2e6381afb63a9feea3
---
 labs/config/scripts.compute | 5 +++++
 labs/config/scripts.network | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/labs/config/scripts.compute b/labs/config/scripts.compute
index 60cc9f65..1988ea30 100644
--- a/labs/config/scripts.compute
+++ b/labs/config/scripts.compute
@@ -8,4 +8,9 @@ cmd snapshot_cycle nova-compute_installed
 cmd queue setup_neutron_compute.sh
 cmd queue setup_cinder_volumes.sh
 cmd snapshot_cycle compute_node_installed
+# Take snapshot of changes on controller VM, too
+cmd queue shutdown_controller.sh
 cmd boot
+cmd wait_for_shutdown -n controller
+cmd snapshot -n controller compute_node_installed
+cmd boot -n controller
diff --git a/labs/config/scripts.network b/labs/config/scripts.network
index bce8ac36..e4c73ce4 100644
--- a/labs/config/scripts.network
+++ b/labs/config/scripts.network
@@ -5,4 +5,9 @@ cmd queue osbash/enable_vagrant_ssh_keys.sh
 cmd snapshot_cycle network_configured
 cmd queue setup_neutron_network.sh
 cmd snapshot_cycle network_node_installed
+# Take snapshot of changes on controller VM, too
+cmd queue shutdown_controller.sh
 cmd boot
+cmd wait_for_shutdown -n controller
+cmd snapshot -n controller network_node_installed
+cmd boot -n controller