openstack/devstack
Code Issues Proposed changes

Update code to remove iscsi targets

Browse Source 
* Fixes bug 928475

Change-Id: I9b54436522422d865c7add750d612c371945817a
This commit is contained in:
Anthony Young 2012-02-08 00:54:20 +00:00 committed by Vishvananda Ishaya
parent b644295126
commit 6325216cde
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stack.sh
View File

@ -1077,15 +1077,12 @@ if [[ "$ENABLED_SERVICES" =~ "n-vol" ]]; then
fi
if sudo vgs $VOLUME_GROUP; then
# Remove nova iscsi targets
sudo tgtadm --op show --mode target | grep $VOLUME_NAME_PREFIX | grep Target | cut -f3 -d ' ' | sudo xargs -n1 tgt-admin --delete || true
# Clean out existing volumes
for lv in `sudo lvs --noheadings -o lv_name $VOLUME_GROUP`; do
# VOLUME_NAME_PREFIX prefixes the LVs we want
if [[ "${lv#$VOLUME_NAME_PREFIX}" != "$lv" ]]; then
tid=`egrep "^tid.+$lv" /proc/net/iet/volume | cut -f1 -d' ' | tr ':' '='`
if [[ -n "$tid" ]]; then
lun=`egrep "lun.+$lv" /proc/net/iet/volume | cut -f1 -d' ' | tr ':' '=' | tr -d '\t'`
sudo ietadm --op delete --$tid --$lun
fi
sudo lvremove -f $VOLUME_GROUP/$lv
fi
done