Remove support for nova-volume
* nova-volume has been removed in Grizzly
* part of delete-nova-volume
Change-Id: Iba91d69950767823d77aaaa93243b0f476dbb04d
diff --git a/exercises/boot_from_volume.sh b/exercises/boot_from_volume.sh
index b06c8dd..4562ac0 100755
--- a/exercises/boot_from_volume.sh
+++ b/exercises/boot_from_volume.sh
@@ -35,9 +35,9 @@
# Import exercise configuration
source $TOP_DIR/exerciserc
-# If cinder or n-vol are not enabled we exit with exitcode 55 so that
+# If cinder is not enabled we exit with exitcode 55 so that
# the exercise is skipped
-is_service_enabled cinder n-vol || exit 55
+is_service_enabled cinder || exit 55
# Boot this image, use first AMI image if unset
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ami}
diff --git a/exercises/euca.sh b/exercises/euca.sh
index b121493..5480b76 100755
--- a/exercises/euca.sh
+++ b/exercises/euca.sh
@@ -73,7 +73,7 @@
# Volumes
# -------
-if [[ "$ENABLED_SERVICES" =~ "n-vol" || "$ENABLED_SERVICES" =~ "c-vol" ]]; then
+if [[ "$ENABLED_SERVICES" =~ "c-vol" ]]; then
VOLUME_ZONE=`euca-describe-availability-zones | head -n1 | cut -f2`
die_if_not_set VOLUME_ZONE "Failure to find zone for volume"
diff --git a/exercises/volumes.sh b/exercises/volumes.sh
index 72c8729..6892739 100755
--- a/exercises/volumes.sh
+++ b/exercises/volumes.sh
@@ -9,7 +9,7 @@
echo "*********************************************************************"
# This script exits on an error so that errors don't compound and you see
-# only the first error that occured.
+# only the first error that occurred.
set -o errexit
# Print the commands being run so that we can see the command that triggers
@@ -33,9 +33,9 @@
# Import exercise configuration
source $TOP_DIR/exerciserc
-# If cinder or n-vol are not enabled we exit with exitcode 55 which mean
+# If cinder is not enabled we exit with exitcode 55 which mean
# exercise is skipped.
-is_service_enabled cinder n-vol || exit 55
+is_service_enabled cinder || exit 55
# Instance type to create
DEFAULT_INSTANCE_TYPE=${DEFAULT_INSTANCE_TYPE:-m1.tiny}