openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix generation of TRIPLEO_CONFIG_HASH for services" into stable/stein

This commit is contained in:
Zuul 2020-02-13 23:28:13 +00:00 committed by Gerrit Code Review
parent bc5a54bdc6 f98605c1df
commit ee74f8f396
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/container-puppet.py
View File

@ -139,6 +139,21 @@ def pull_image(name):
log.debug(cmd_stderr)
def get_config_base(prefix, volume):
# crawl the volume's path upwards until we find the
# volume's base, where the hashed config file resides
path = volume
base = prefix.rstrip(os.path.sep)
base_generated = os.path.join(base, 'puppet-generated')
while path.startswith(prefix):
dirname = os.path.dirname(path)
if dirname == base or dirname == base_generated:
return path
else:
path = dirname
raise ValueError("Could not find config's base for '%s'" % volume)
def match_config_volumes(prefix, config):
# Match the mounted config volumes - we can't just use the
# key as e.g "novacomute" consumes config-data/nova
@ -147,8 +162,8 @@ def match_config_volumes(prefix, config):
except AttributeError:
log.error('Error fetching volumes. Prefix: %s - Config: %s' % (prefix, config))
raise
return sorted([os.path.dirname(v.split(":")[0]) for v in volumes if
v.startswith(prefix)])
return sorted([get_config_base(prefix, v.split(":")[0])
for v in volumes if v.startswith(prefix)])
def get_config_hash(config_volume):