Resolve conflict as forceencap is already in master

2016-04-30 21:09:33 +02:00 · 2016-04-30 21:09:33 +02:00 · ebb7cb690d
parent 30741a3309
commit ebb7cb690d
1 changed files with 0 additions and 2 deletions
--- 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")