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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/779f4b36 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/779f4b36 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/779f4b36 Branch: refs/heads/master Commit: 779f4b36e03738a9eb1ffa4c474e9b4968cd7b72 Parents: 9be76b3 Author: Remi Bergsma <[email protected]> Authored: Thu Dec 31 14:08:14 2015 +0100 Committer: Remi Bergsma <[email protected]> Committed: Thu Dec 31 14:11:06 2015 +0100 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/779f4b36/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py b/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py index 98244db..d5ffae1 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py @@ -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
