Browse Source

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

changes/81/706381/2
Zuul 1 week ago
parent
commit
e4b554d26f
1 changed files with 5 additions and 3 deletions
  1. +5
    -3
      common/container-puppet.py

+ 5
- 3
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:

Loading…
Cancel
Save