You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/21 22:32:18 UTC
[2/7] git commit: updated refs/heads/4.8 to c2fc0c4
Check the existence of 'forceencap' parameter before use
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53de78f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53de78f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53de78f6
Branch: refs/heads/4.8
Commit: 53de78f64230cc688f32aa072bdb6359fb77714d
Parents: a243339
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Feb 5 16:58:01 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Apr 19 11:11:19 2016 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53de78f6/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index ab134fc..fd37f40 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -531,6 +531,8 @@ class CsSite2SiteVpn(CsDataBag):
file.addeq(" pfs=%s" % CsHelper.bool_to_yn(obj['dpd']))
file.addeq(" keyingtries=2")
file.addeq(" auto=start")
+ if 'encap' not in obj:
+ obj['encap']=False
file.addeq(" forceencaps=%s" % CsHelper.bool_to_yn(obj['encap']))
if obj['dpd']:
file.addeq(" dpddelay=30")