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/07/18 18:05:49 UTC
[2/2] git commit: updated refs/heads/4.7 to adaf410
Merge pull request #1480 from Slair1/S2S-VPN-PFS-Setting
CLOUDSTACK-9342: Site to Site VPN PFS not being set correctlyBug in code set PFS to the same value (yes/no) as DPD.
file.addeq(" pfs=%s" % CsHelper.bool_to_yn(obj['dpd']))
* pr/1480:
CLOUDSTACK-9342: Site to Site VPN PFS not being set correctly
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/adaf4101
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/adaf4101
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/adaf4101
Branch: refs/heads/4.7
Commit: adaf410109a67c861bb32753c9b13ddd09403672
Parents: 8eedead 7b9b328
Author: Will Stevens <wi...@gmail.com>
Authored: Mon Jul 18 14:05:17 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Mon Jul 18 14:05:18 2016 -0400
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adaf4101/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
diff --cc systemvm/patches/debian/config/opt/cloud/bin/configure.py
index b5f65e7,e2b635c..40242ee
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@@ -508,11 -528,12 +508,14 @@@ class CsSite2SiteVpn(CsDataBag)
file.addeq(" ikelifetime=%s" % self.convert_sec_to_h(obj['ike_lifetime']))
file.addeq(" esp=%s" % obj['esp_policy'])
file.addeq(" salifetime=%s" % self.convert_sec_to_h(obj['esp_lifetime']))
- file.addeq(" pfs=%s" % CsHelper.bool_to_yn(obj['dpd']))
+ if "modp" in obj['esp_policy']:
+ file.addeq(" pfs=yes")
+ else:
+ file.addeq(" pfs=no")
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")