From 85218010168ba8af0d7280eb4affeaf633b8129e Mon Sep 17 00:00:00 2001
From: Pranav Salunke <dguitarbite@gmail.com>
Date: Mon, 15 Sep 2014 15:32:07 +0200
Subject: [PATCH] Moves cinder tests to cidner_volues script

As the installation of cinder volumes section is separated to another
node (compute node for now) which may not be the same node as the
node running controller side of cinder's services, the tests should
also be moved to the appropriate location.

Change-Id: I2c2e6e64807e026783881197d62243b4751f7f41
---
 labs/scripts/setup_cinder_controller.sh | 20 --------------------
 labs/scripts/setup_cinder_volumes.sh    | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/labs/scripts/setup_cinder_controller.sh b/labs/scripts/setup_cinder_controller.sh
index ab41d170..ce10bce3 100755
--- a/labs/scripts/setup_cinder_controller.sh
+++ b/labs/scripts/setup_cinder_controller.sh
@@ -103,23 +103,3 @@ echo "Restarting cinder service."
 sudo service cinder-scheduler restart
 sudo service cinder-api restart
 
-#------------------------------------------------------------------------------
-# Verify the Block Storage installation
-#------------------------------------------------------------------------------
-
-echo "Waiting for cinder to start."
-until cinder list >/dev/null 2>&1; do
-    sleep 1
-done
-
-echo "cinder create --display-name labsVolume 1"
-cinder create --display-name labsVolume 1
-
-echo "cinder list"
-cinder list
-
-echo "cinder delete labsVolume"
-cinder delete labsVolume
-
-echo "cinder list"
-cinder list
diff --git a/labs/scripts/setup_cinder_volumes.sh b/labs/scripts/setup_cinder_volumes.sh
index ac8d6fe0..ff6d0a85 100755
--- a/labs/scripts/setup_cinder_volumes.sh
+++ b/labs/scripts/setup_cinder_volumes.sh
@@ -79,3 +79,25 @@ iniset_sudo $conf DEFAULT glance_host controller-mgmt
 echo "Restarting cinder service."
 sudo service cinder-volume restart
 sudo service tgt restart
+
+#------------------------------------------------------------------------------
+# Verify the Block Storage installation
+#------------------------------------------------------------------------------
+
+echo "Waiting for cinder to start."
+until cinder list >/dev/null 2>&1; do
+    sleep 1
+done
+
+echo "cinder create --display-name labsVolume 1"
+cinder create --display-name labsVolume 1
+
+echo "cinder list"
+cinder list
+
+echo "cinder delete labsVolume"
+cinder delete labsVolume
+
+echo "cinder list"
+cinder list
+