openstack/grenade
Code Issues Proposed changes

clean.sh: use $VOLUME_GROUP_NAME instead of $VOLUME_GROUP

Browse Source 
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
This commit is contained in:
Jordan Pittier 2016-11-18 11:17:54 +01:00
parent 2119a54034
commit 48d1306b74
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clean.sh
View File

@ -35,7 +35,7 @@ if [[ -d $BASE_DEVSTACK_DIR ]]; then
DATA_DIR=${STACK_ROOT}/data; \ DATA_DIR=${STACK_ROOT}/data; \
./unstack.sh --all; \ ./unstack.sh --all; \
cd -; \ 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 \ if mount | grep \$DATA_DIR/swift/drives; then \
umount \$DATA_DIR/swift/drives/sdb1; \ umount \$DATA_DIR/swift/drives/sdb1; \
fi; \ fi; \
@ -53,7 +53,7 @@ if [[ -d $TARGET_DEVSTACK_DIR ]]; then
./unstack.sh --all; \ ./unstack.sh --all; \
cd -; \ cd -; \
# need to test if volume is present # 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 \ if mount | grep \$DATA_DIR/swift/drives; then \
sudo umount \$DATA_DIR/swift/drives/sdb1; \ sudo umount \$DATA_DIR/swift/drives/sdb1; \
fi; \ fi; \