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