openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add volumes list of docker-puppet container when merging config volumes" into stable/queens

This commit is contained in:
Zuul 2018-04-27 02:08:58 +00:00 committed by Gerrit Code Review
parent 7853b511d9 db6f0d3b60
commit 85fbd083bb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/docker-puppet.py
View File

@ -188,6 +188,9 @@ for service in (json_data or []):
if configs[config_volume][3] != config_image:
log.warn("Config containers do not match even though"
" shared volumes are the same!")
if volumes:
configs[config_volume][4].extend(volumes)
else:
if not config_volume_only or (config_volume_only == config_volume):
log.debug("Adding new service")