From ebb7cb690dd04263568cae0a93e4ff28e5ba157a Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Sat, 30 Apr 2016 21:09:33 +0200 Subject: [PATCH] Resolve conflict as forceencap is already in master --- systemvm/patches/debian/config/opt/cloud/bin/configure.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py index 27e26a7587e..1e4469c3ea5 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py @@ -536,8 +536,6 @@ class CsSite2SiteVpn(CsDataBag): file.addeq(" pfs=%s" % CsHelper.bool_to_yn(obj['dpd'])) file.addeq(" keyingtries=2") file.addeq(" auto=start") - if not obj.has_key('encap'): - obj['encap']="false" file.addeq(" forceencaps=%s" % CsHelper.bool_to_yn(obj['encap'])) if obj['dpd']: file.addeq(" dpddelay=30")