diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-06-11 01:32:11 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-06-11 01:32:11 +0000 |
commit | ec97870ad4b4794a12388a7427b9056e44838a28 (patch) | |
tree | d13d8c8958bd68aa2b46156c3b8f30d74426babd | |
parent | 4d42df500a3ef7a03dccd230e26727335d4e13b1 (diff) | |
parent | e45eca4dc5d74d800145f985e6e2617650398d09 (diff) | |
download | heat-ec97870ad4b4794a12388a7427b9056e44838a28.tar.gz |
Merge "Copy environment before decrypting"
-rw-r--r-- | heat/objects/raw_template.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/heat/objects/raw_template.py b/heat/objects/raw_template.py index af2020072..473115bbf 100644 --- a/heat/objects/raw_template.py +++ b/heat/objects/raw_template.py @@ -17,6 +17,8 @@ RawTemplate object """ +import copy + from oslo_config import cfg from oslo_utils import encodeutils from oslo_versionedobjects import base @@ -46,6 +48,7 @@ class RawTemplate( for field in tpl.fields: tpl[field] = db_tpl[field] + 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: parameters = tpl.environment[env_fmt.PARAMETERS] |