openstack
/
tripleo-heat-templates
Code Issues Proposed changes

container-puppet: update 'env' when not null 

Only update "env" if the content isn't null otherwise we'll have
container configs with:
"environment": null

And it causes problem later when we manipulate the config.

Change-Id: I0269a7ad0cf54e75dd25f8b3566ac0cab06fd93c
(cherry picked from commit c01f383ea0)
This commit is contained in:
Emilien Macchi 2019-11-07 15:14:13 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 87d9949053
commit bd4c3f6dc9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/container-puppet.py
View File

@ -509,9 +509,11 @@ for infile in infiles:
if config_hash:
log.debug("Updating config hash for %s, config_volume=%s hash=%s" % (c_name, config_volume, config_hash))
# When python 27 support is removed, we will be able to use z = {**x, **y} to merge the dicts.
infile_data.get('environment', {}).update({'TRIPLEO_CONFIG_HASH': config_hash})
env = infile_data.get('environment')
infile_data['environment'] = env
if infile_data.get('environment', None) is None:
infile_data['environment'] = {}
infile_data['environment'].update(
{'TRIPLEO_CONFIG_HASH': config_hash}
)
outfile = os.path.join(os.path.dirname(infile), "hashed-" + os.path.basename(infile))
with open(outfile, 'w') as out_f: