openstack/devstack
Code Issues Proposed changes

Merge "Wait for VM to stop before deleting security group."

Browse Source
This commit is contained in:
Jenkins
2012-02-24 21:56:22 +00:00
committed by Gerrit Code Review
parent a6f5fdd4ee 5836b1533a
commit a205b46788
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
exercises/floating_ips.sh
View File

@@ -195,8 +195,11 @@ nova floating-ip-delete $TEST_FLOATING_IP
# shutdown the server
nova delete $VM_UUID
# make sure the VM shuts down within a reasonable time
if ! timeout $TERMINATE_TIMEOUT sh -c "while nova show $VM_UUID | grep status | grep -q ACTIVE; do sleep 1; done"; then
echo "server didn't shut down!"
exit 1
fi
# Delete a secgroup
nova secgroup-delete $SECGROUP
# FIXME: validate shutdown within 5 seconds
# (nova show $NAME returns 1 or status != ACTIVE)?