diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-13 23:34:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-13 23:34:13 +0000 |
| commit | b9478a33bb5a38ea5e9a56e417237da31b958360 (patch) | |
| tree | f6f51e60921933effc92f46bcf834bb500e356df /bin | |
| parent | b97460a62a2160527af03b4d79632444fafda71c (diff) | |
| parent | 42e785561e9c747cab41d74dbe90cad56e8eea14 (diff) | |
| download | nova-b9478a33bb5a38ea5e9a56e417237da31b958360.tar.gz nova-b9478a33bb5a38ea5e9a56e417237da31b958360.tar.xz nova-b9478a33bb5a38ea5e9a56e417237da31b958360.zip | |
Merge "Always attempt to delete entire floating IP range."
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 22f670442..b477ed284 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -372,8 +372,11 @@ class FloatingIpCommands(object): def delete(self, ip_range): """Deletes floating ips by range""" for address in self.address_to_hosts(ip_range): - db.floating_ip_destroy(context.get_admin_context(), - str(address)) + try: + db.floating_ip_destroy(context.get_admin_context(), + str(address)) + except exception.FloatingIpNotFoundForAddress as ex: + print "Warning: %s" % ex @args('--host', dest="host", metavar='<host>', help='Host') def list(self, host=None): |