[5/6] git commit: updated refs/heads/4.7 to d13ff88

[sw...@apache.org]

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 <wi...@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/4.7
Commit: a7fef86bb35f136cc9605ab15043763775f4c6ca
Parents: f9846f1 53de78f
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 21 16:30:16 2016 -0400
Committer: Will Stevens <wi...@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
----------------------------------------------------------------------