Merge "container-puppet: update 'env' when not null" into stable/train

This commit is contained in:
Zuul 2020-02-06 22:25:20 +00:00 committed by Gerrit Code Review
commit e4b554d26f
1 changed files with 5 additions and 3 deletions

View File

@ -509,9 +509,11 @@ for infile in infiles:
if config_hash: if config_hash:
log.debug("Updating config hash for %s, config_volume=%s hash=%s" % (c_name, config_volume, 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. # 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}) if infile_data.get('environment', None) is None:
env = infile_data.get('environment') infile_data['environment'] = {}
infile_data['environment'] = env infile_data['environment'].update(
{'TRIPLEO_CONFIG_HASH': config_hash}
)
outfile = os.path.join(os.path.dirname(infile), "hashed-" + os.path.basename(infile)) outfile = os.path.join(os.path.dirname(infile), "hashed-" + os.path.basename(infile))
with open(outfile, 'w') as out_f: with open(outfile, 'w') as out_f: