From 709be45cf0f32bacc54ec2384be9e54bd62a5acf Mon Sep 17 00:00:00 2001 From: Boris Schrijver Date: Fri, 5 Feb 2016 21:06:53 +0100 Subject: [PATCH] Check the existence of 'forceencap' parameter before use --- systemvm/patches/debian/config/opt/cloud/bin/configure.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py index 840c7cb6017..f317b87b6ba 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py @@ -520,6 +520,8 @@ 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")