Merge "add gating up/down script for devstack"
This commit is contained in:
12
unstack.sh
12
unstack.sh
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/bin/bash
|
||||
|
||||
# **unstack.sh**
|
||||
|
||||
@@ -138,10 +138,13 @@ fi
|
||||
|
||||
SCSI_PERSIST_DIR=$CINDER_STATE_PATH/volumes/*
|
||||
|
||||
# BUG: tgt likes to exit 1 on service stop if everything isn't
|
||||
# perfect, we should clean up cinder stop paths.
|
||||
|
||||
# Get the iSCSI volumes
|
||||
if is_service_enabled cinder; then
|
||||
stop_cinder
|
||||
cleanup_cinder
|
||||
stop_cinder || /bin/true
|
||||
cleanup_cinder || /bin/true
|
||||
fi
|
||||
|
||||
if [[ -n "$UNSTACK_ALL" ]]; then
|
||||
@@ -181,4 +184,5 @@ if [[ -n "$SCREEN" ]]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
clean_lvm_volume_group $DEFAULT_VOLUME_GROUP_NAME
|
||||
# BUG: maybe it doesn't exist? We should isolate this further down.
|
||||
clean_lvm_volume_group $DEFAULT_VOLUME_GROUP_NAME || /bin/true
|
||||
|
Reference in New Issue
Block a user