CLOUDSTACK-9204 Do not error when staticroute is already gone

When deleting fails because it isn't there any morei (KeyError), it should succeed instead.
This commit is contained in:
Remi Bergsma 2015-12-31 14:08:14 +01:00
parent 9be76b350f
commit 779f4b36e0
1 changed files with 4 additions and 1 deletions

View File

@ -23,7 +23,10 @@ def merge(dbag, staticroutes):
key = route['ip_address']
revoke = route['revoke']
if revoke:
del dbag[key]
try:
del dbag[key]
except KeyError:
pass
else:
dbag[key] = route