From c477accdee77ab35ba8affc72d337791b656096b Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Mon, 27 Oct 2014 16:43:28 +0100
Subject: [PATCH] labs: remove quotation marks from snapshot names

The quotation marks around the snapshot names ended up as part of the
snapshot names on Linux. With the current code, removing the quotation
marks means that introducing whitespace into snapshot names would break
the Windows batch scripts.

Change-Id: I12d6e6889fdf6da6d90695a7168721687beb4f2b
---
 labs/config/scripts.compute    |  6 +++---
 labs/config/scripts.controller | 18 +++++++++---------
 labs/config/scripts.network    |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/labs/config/scripts.compute b/labs/config/scripts.compute
index 2b10f257..60cc9f65 100644
--- a/labs/config/scripts.compute
+++ b/labs/config/scripts.compute
@@ -2,10 +2,10 @@
 cmd init_node
 cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
-cmd snapshot_cycle "network_configured"
+cmd snapshot_cycle network_configured
 cmd queue setup_nova_compute.sh
-cmd snapshot_cycle "nova-compute_installed"
+cmd snapshot_cycle nova-compute_installed
 cmd queue setup_neutron_compute.sh
 cmd queue setup_cinder_volumes.sh
-cmd snapshot_cycle "compute_node_installed"
+cmd snapshot_cycle compute_node_installed
 cmd boot
diff --git a/labs/config/scripts.controller b/labs/config/scripts.controller
index f568d909..ccb52436 100644
--- a/labs/config/scripts.controller
+++ b/labs/config/scripts.controller
@@ -2,24 +2,24 @@
 cmd init_node
 cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
-cmd snapshot_cycle "network_configured"
+cmd snapshot_cycle network_configured
 cmd queue apt_install_mysql.sh
 cmd queue install_rabbitmq.sh
-cmd snapshot_cycle "pre-openstack_installed"
+cmd snapshot_cycle pre-openstack_installed
 cmd queue setup_keystone.sh
-cmd snapshot_cycle "keystone_installed"
+cmd snapshot_cycle keystone_installed
 cmd queue setup_glance.sh
-cmd snapshot_cycle "glance_installed"
+cmd snapshot_cycle glance_installed
 cmd queue setup_nova_controller.sh
-cmd snapshot_cycle "nova-controller_installed"
+cmd snapshot_cycle nova-controller_installed
 cmd queue setup_neutron_controller.sh
-cmd snapshot_cycle "neutron-controller_installed"
+cmd snapshot_cycle neutron-controller_installed
 cmd queue setup_cinder_controller.sh
-cmd snapshot_cycle "cinder_installed"
+cmd snapshot_cycle cinder_installed
 cmd queue setup_horizon.sh
-cmd snapshot_cycle "horizon_installed"
+cmd snapshot_cycle horizon_installed
 cmd queue config_external_network.sh
 cmd queue config_demo_user.sh
 cmd queue config_tenant_network.sh
-cmd snapshot_cycle "controller_node_installed"
+cmd snapshot_cycle controller_node_installed
 cmd boot
diff --git a/labs/config/scripts.network b/labs/config/scripts.network
index 87e1af2c..bce8ac36 100644
--- a/labs/config/scripts.network
+++ b/labs/config/scripts.network
@@ -2,7 +2,7 @@
 cmd init_node
 cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
-cmd snapshot_cycle "network_configured"
+cmd snapshot_cycle network_configured
 cmd queue setup_neutron_network.sh
-cmd snapshot_cycle "network_node_installed"
+cmd snapshot_cycle network_node_installed
 cmd boot