Return-Path: 
 <commits-return-55391-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0269019BB8
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu, 21 Apr 2016 20:33:11 +0000 (UTC)
Received: (qmail 54296 invoked by uid 500); 21 Apr 2016 20:33:10 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 54182 invoked by uid 500); 21 Apr 2016 20:33:10 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 54056 invoked by uid 99); 21 Apr 2016 20:33:09 -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; Thu, 21 Apr 2016 20:33:09 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id C539CE01F4; Thu, 21 Apr 2016 20:33:09 +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: Thu, 21 Apr 2016 20:33:13 -0000
Message-Id: <4128d6fab77246f58c06e1e185a2f0fe@git.apache.org>
In-Reply-To: <33716ed347734be8a91aa550acba8970@git.apache.org>
References: <33716ed347734be8a91aa550acba8970@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [5/8] git commit: updated refs/heads/master to 37afba0

Merge pull request #1402 from remibergsma/forceencap_check

Check the existence of 'forceencap' parameter before useCheck the existence of 'forceencap' parameter before use.

Error seen:

```
Traceback (most recent call last):
  File "/opt/cloud/bin/update_config.py", line 140, in <module>
    process_file()
  File "/opt/cloud/bin/update_config.py", line 54, in process_file
    finish_config()
  File "/opt/cloud/bin/update_config.py", line 44, in finish_config
    returncode = configure.main(sys.argv)
  File "/opt/cloud/bin/configure.py", line 1003, in main
    vpns.process()
  File "/opt/cloud/bin/configure.py", line 488, in process
    self.configure_ipsec(self.dbag[vpn])
  File "/opt/cloud/bin/configure.py", line 544, in configure_ipsec
    file.addeq(" forceencaps=%s" % CsHelper.bool_to_yn(obj['encap']))
KeyError: 'encap'
```

* pr/1402:
  Check the existence of 'forceencap' parameter before use

Signed-off-by: Will Stevens <williamstevens@gmail.com>


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

Branch: refs/heads/master
Commit: a7fef86bb35f136cc9605ab15043763775f4c6ca
Parents: f9846f1 53de78f
Author: Will Stevens <williamstevens@gmail.com>
Authored: Thu Apr 21 16:30:16 2016 -0400
Committer: Will Stevens <williamstevens@gmail.com>
Committed: Thu Apr 21 16:30:16 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7fef86b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------