Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 58326200B48 for ; Mon, 18 Jul 2016 20:06:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 56F1A160A5D; Mon, 18 Jul 2016 18:06:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AA036160A6D for ; Mon, 18 Jul 2016 20:06:32 +0200 (CEST) Received: (qmail 64422 invoked by uid 500); 18 Jul 2016 18:06:31 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 64412 invoked by uid 99); 18 Jul 2016 18:06:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2016 18:06:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5EDE9DFAF5; Mon, 18 Jul 2016 18:06:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Mon, 18 Jul 2016 18:06:31 -0000 Message-Id: <4706f79a1c1e491eb531f9a12fd11100@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: updated refs/heads/4.8 to 01758ee archived-at: Mon, 18 Jul 2016 18:06:33 -0000 Repository: cloudstack Updated Branches: refs/heads/4.8 142f07d77 -> 01758ee86 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/4.8 Commit: 7b9b328f309f40497b17c5840b4f8b806c26089f Parents: ef115ab Author: Slair1 Authored: Fri Apr 8 13:08:58 2016 -0500 Committer: Slair1 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']))