From 48d1306b740dee96aa06b22e926f8151b1d4cfd2 Mon Sep 17 00:00:00 2001
From: Jordan Pittier <jordan.pittier@scality.com>
Date: Fri, 18 Nov 2016 11:17:54 +0100
Subject: [PATCH] clean.sh: use $VOLUME_GROUP_NAME instead of $VOLUME_GROUP

We should be using $VOLUME_GROUP_NAME instead since Icehouse.
$VOLUME_GROUP_NAME has been introduced in devstack in
I93b8ef32832269d730c76a6dc24ddb4f20c6d9df and $VOLUME_GROUP is nowadays
only use as a fallback to $VOLUME_GROUP_NAME.

This is related to this devstack change
Id3051b5a196c45266c39fde4f08401aaacf0f6bd which tries to remove all
occurences of $VOLUME_GROUP in devstack.

Change-Id: I438973d559f7569ea5602091ed837e3d3959bf7b
---
 clean.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clean.sh b/clean.sh
index 47feb19d..5af77762 100755
--- a/clean.sh
+++ b/clean.sh
@@ -35,7 +35,7 @@ if [[ -d $BASE_DEVSTACK_DIR ]]; then
         DATA_DIR=${STACK_ROOT}/data; \
         ./unstack.sh --all; \
         cd -; \
-        sudo losetup -d \$(sudo losetup -j \$DATA_DIR/\${VOLUME_GROUP}-backing-file | awk -F':' '/backing-file/ { print \$1}'); \
+        sudo losetup -d \$(sudo losetup -j \$DATA_DIR/\${VOLUME_GROUP_NAME}-backing-file | awk -F':' '/backing-file/ { print \$1}'); \
         if mount | grep \$DATA_DIR/swift/drives; then \
             umount \$DATA_DIR/swift/drives/sdb1; \
         fi; \
@@ -53,7 +53,7 @@ if [[ -d $TARGET_DEVSTACK_DIR ]]; then
         ./unstack.sh --all; \
         cd -; \
         # need to test if volume is present
-        sudo losetup -d \$(sudo losetup -j \$DATA_DIR/\${VOLUME_GROUP}-backing-file | awk -F':' '/backing-file/ { print \$1}'); \
+        sudo losetup -d \$(sudo losetup -j \$DATA_DIR/\${VOLUME_GROUP_NAME}-backing-file | awk -F':' '/backing-file/ { print \$1}'); \
         if mount | grep \$DATA_DIR/swift/drives; then \
             sudo umount \$DATA_DIR/swift/drives/sdb1; \
         fi; \