etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.8 to master 

* 4.8:
  CLOUDSTACK-9342: Site to Site VPN PFS not being set correctly
This commit is contained in:
Will Stevens 2016-07-18 14:07:09 -04:00
parent 1f9bf93948 01758ee867
commit 49df7f283c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
systemvm/patches/debian/config/opt/cloud/bin/configure.py
View File

@ -508,7 +508,10 @@ 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: