Remove support for nova-volume
* nova-volume has been removed in Grizzly
* part of delete-nova-volume
Change-Id: Iba91d69950767823d77aaaa93243b0f476dbb04d
diff --git a/stack.sh b/stack.sh
index 40eab36..75e0244 100755
--- a/stack.sh
+++ b/stack.sh
@@ -93,7 +93,7 @@
# ============
# Remove services which were negated in ENABLED_SERVICES
-# using the "-" prefix (e.g., "-n-vol") instead of
+# using the "-" prefix (e.g., "-rabbit") instead of
# calling disable_service().
disable_negated_services
@@ -154,12 +154,6 @@
fi
unset rpc_backend_cnt
-# Make sure we only have one volume service enabled.
-if is_service_enabled cinder && is_service_enabled n-vol; then
- echo "ERROR: n-vol and cinder must not be enabled at the same time"
- exit 1
-fi
-
# Set up logging level
VERBOSE=$(trueorfalse True $VERBOSE)
@@ -310,7 +304,6 @@
source $TOP_DIR/lib/glance
source $TOP_DIR/lib/nova
source $TOP_DIR/lib/cinder
-source $TOP_DIR/lib/n-vol
source $TOP_DIR/lib/ceilometer
source $TOP_DIR/lib/heat
source $TOP_DIR/lib/quantum
@@ -1749,9 +1742,6 @@
if is_service_enabled cinder; then
echo_summary "Configuring Cinder"
init_cinder
-elif is_service_enabled n-vol; then
- echo_summary "Configuring Nova volumes"
- init_nvol
fi
if is_service_enabled nova; then
@@ -1951,10 +1941,6 @@
echo_summary "Starting Nova"
start_nova
fi
-if is_service_enabled n-vol; then
- echo_summary "Starting Nova volumes"
- start_nvol
-fi
if is_service_enabled cinder; then
echo_summary "Starting Cinder"
start_cinder