cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaya...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 97eb0f7
Date Wed, 05 Aug 2015 08:45:57 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 7b47c49bb -> 97eb0f752


CLOUDSTACK-8707: Added missed esp policy esp is added with esp_lifetime instead of esp_policy,
corrected it.


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

Branch: refs/heads/master
Commit: c13201353c312143fb85d11a141f08a587d32f5d
Parents: 7b47c49
Author: Jayapal <jayapal@apache.org>
Authored: Tue Aug 4 12:04:58 2015 +0530
Committer: Jayapal <jayapal@apache.org>
Committed: Wed Aug 5 14:14:46 2015 +0530

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/configure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1320135/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 2e8be9a..5ed2789 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -459,7 +459,7 @@ class CsSite2SiteVpn(CsDataBag):
         file.addeq(" keyexchange=ike")
         file.addeq(" ike=%s" % obj['ike_policy'])
         file.addeq(" ikelifetime=%s" % self.convert_sec_to_h(obj['ike_lifetime']))
-        file.addeq(" esp=%s" % self.convert_sec_to_h(obj['esp_lifetime']))
+        file.addeq(" esp=%s" % self.convert_sec_to_h(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']))
         file.addeq(" keyingtries=2")


Mime
View raw message