openstack/astara-appliance
Code Issues Proposed changes

Skip IP addresses that fail to delete (instead of raising a 500).

Browse Source 
Change-Id: Ib30a0736277c90171e92617819ea34109481d8ad
This commit is contained in:
Ryan Petrello 2016-06-21 17:08:38 -04:00
parent 4f09fd0f2f
commit 8868ad47a2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
astara_router/drivers/ip.py
View File

@ -240,7 +240,10 @@ class IPManager(base.Manager):
self.up(interface) self.up(interface)
for item in (prev_set - next_set): for item in (prev_set - next_set):
self.sudo(*fmt_args_delete(item)) try:
self.sudo(*fmt_args_delete(item))
except RuntimeError:
LOG.warning('IP could not be deleted: %s' % item)
ip, prefix = item ip, prefix = item
if ip.version == 4: if ip.version == 4:
self._delete_conntrack_state(ip) self._delete_conntrack_state(ip)