cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [1/4] git commit: updated refs/heads/master to 49df7f2
Date Mon, 18 Jul 2016 18:07:39 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 1f9bf9394 -> 49df7f283


CLOUDSTACK-9342: Site to Site VPN PFS not being set correctly

Bug in code set PFS to the same value (yes/no) as DPD.

file.addeq(" pfs=%s" % CsHelper.bool_to_yn(obj['dpd']))


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b9b328f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b9b328f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b9b328f

Branch: refs/heads/master
Commit: 7b9b328f309f40497b17c5840b4f8b806c26089f
Parents: ef115ab
Author: Slair1 <slair@ippathways.com>
Authored: Fri Apr 8 13:08:58 2016 -0500
Committer: Slair1 <slair@ippathways.com>
Committed: Fri Apr 15 12:00:16 2016 -0500

----------------------------------------------------------------------
 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/7b9b328f/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..e2b635c 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -528,7 +528,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")
         file.addeq(" forceencaps=%s" % CsHelper.bool_to_yn(obj['encap']))


Mime
View raw message