openstack
/
heat
Code Issues Proposed changes

Merge "Check that env is not None before decrypting"

This commit is contained in:
Jenkins 2015-06-12 04:16:51 +00:00 committed by Gerrit Code Review
parent 13db9ccfee b6f865fa00
commit 79c86def56
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/objects/raw_template.py
View File

@ -50,7 +50,8 @@ class RawTemplate(
tpl.environment = copy.deepcopy(tpl.environment)
# If any of the parameters were encrypted, then decrypt them
if env_fmt.ENCRYPTED_PARAM_NAMES in tpl.environment:
if (tpl.environment is not None and
env_fmt.ENCRYPTED_PARAM_NAMES in tpl.environment):
parameters = tpl.environment[env_fmt.PARAMETERS]
encrypted_param_names = tpl.environment[
env_fmt.ENCRYPTED_PARAM_NAMES]