From a40415604a9a8bbdc7833d850c4f74d66236d334 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Sat, 30 Jan 2016 06:24:03 +0100 Subject: [PATCH] CLOUDSTACK-9266: Make deleting static routes in private gw work --- .../debian/config/opt/cloud/bin/cs_staticroutes.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 987005baa93..209eefe41fc 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py @@ -21,13 +21,5 @@ from pprint import pprint def merge(dbag, staticroutes): for route in staticroutes['routes']: key = route['network'] - revoke = route['revoke'] - if revoke: - try: - del dbag[key] - except KeyError: - pass - else: - dbag[key] = route - + dbag[key] = route return dbag