openstack/devstack
Code Issues Proposed changes

Merge "Fix intermittent error in exercises/floating_ips.sh"

Browse Source
This commit is contained in:
Jenkins 2014-03-08 18:12:46 +00:00 committed by Gerrit Code Review
commit 45d5db3dff
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exercises/floating_ips.sh
View File

@ -178,6 +178,10 @@ fi
nova secgroup-delete-rule $SECGROUP icmp -1 -1 0.0.0.0/0 || \ nova secgroup-delete-rule $SECGROUP icmp -1 -1 0.0.0.0/0 || \
die $LINENO "Failure deleting security group rule from $SECGROUP" die $LINENO "Failure deleting security group rule from $SECGROUP"
if ! timeout $ASSOCIATE_TIMEOUT sh -c "while nova secgroup-list-rules $SECGROUP | grep -q icmp; do sleep 1; done"; then
die $LINENO "Security group rule not deleted from $SECGROUP"
fi
# FIXME (anthony): make xs support security groups # FIXME (anthony): make xs support security groups
if [ "$VIRT_DRIVER" != "xenserver" -a "$VIRT_DRIVER" != "openvz" ]; then if [ "$VIRT_DRIVER" != "xenserver" -a "$VIRT_DRIVER" != "openvz" ]; then
# Test we can aren't able to ping our floating ip within ASSOCIATE_TIMEOUT seconds # Test we can aren't able to ping our floating ip within ASSOCIATE_TIMEOUT seconds