openstack/tripleo-incubator
Code Issues Proposed changes

Fix cleanup-env baremetal pattern matching

Browse Source 
Currently this leaves a group of baremetalbrbm_$n VMs defined in my
environment, while deleting the baremetal_$n ones.  The "regex" is
really just a prefix for the expected naming convention, so instead
just look for the expected prefix, then all baremetal* nodes are
cleaned up.

Change-Id: Id895ebc7334545b847939c67d818f9eaedc8313e
This commit is contained in:
Steven Hardy 2015-05-27 06:03:53 -04:00
parent a921c20755
commit e7f7d8bce0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/cleanup-env
View File

@ -71,7 +71,7 @@ while true ; do
done
SEED_NAME=seed
BAREMETAL_REGEX="baremetal"
BAREMETAL_PREFIX="baremetal"
NUMBERED_BRIDGE_NAMES=
if [ -n "$NUM" ]; then
@ -84,14 +84,14 @@ done
NUMBERED_BRIDGE_NAMES=${NUMBERED_BRIDGE_NAMES%_}
if [ -z "$CLEANUP_ALL" ]; then
BAREMETAL_REGEX="baremetal${NUMBERED_BRIDGE_NAMES}"
BAREMETAL_PREFIX="baremetal${NUMBERED_BRIDGE_NAMES}"
fi
for NAME in $(sudo virsh list --name | grep "^\($SEED_NAME\|${BAREMETAL_REGEX}_.*\)$"); do
for NAME in $(sudo virsh list --name | grep "^\($SEED_NAME\|${BAREMETAL_PREFIX}\)"); do
sudo virsh destroy $NAME
done
for NAME in $(sudo virsh list --name --all | grep "^\($SEED_NAME\|${BAREMETAL_REGEX}_.*\)$"); do
for NAME in $(sudo virsh list --name --all | grep "^\($SEED_NAME\|${BAREMETAL_PREFIX}\)"); do
if [ $NAME == $SEED_NAME ]; then
# handle seeds differently since their storage is not managed by libvirt
sudo virsh undefine --managed-save $NAME
@ -101,6 +101,6 @@ for NAME in $(sudo virsh list --name --all | grep "^\($SEED_NAME\|${BAREMETAL_RE
fi
done
for NAME in $(sudo virsh vol-list $LIBVIRT_VOL_POOL 2>/dev/null | grep /var/ | awk '{print $1}' | grep "^\($SEED_NAME\|${BAREMETAL_REGEX}_.*\)$"); do
for NAME in $(sudo virsh vol-list $LIBVIRT_VOL_POOL 2>/dev/null | grep /var/ | awk '{print $1}' | grep "^\($SEED_NAME\|${BAREMETAL_PREFIX}\)"); do
sudo virsh vol-delete --pool $LIBVIRT_VOL_POOL $NAME
done