openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add volumes list of docker-puppet container when merging config volumes 

When config volumes of same types are merged, the volumes to be mounted
for the continer is not merged. In order to run neutron container with
ovs agent, '/run/openvswitch' directory mount is required to execute
ovs-vsctl commands. This patch merges the volumes list of the same
config volumes instead of taking only the first one.

Closes-Bug: #1766759
Change-Id: I70972ad2fc339c9316befd74dda8555982f23316
This commit is contained in:
Saravanan KR 2018-04-24 19:47:47 +05:30
parent 373a873689
commit ec3e347092
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

@ -198,6 +198,9 @@ for service in (json_data or []):
if configs[config_volume][3] != config_image:
log.warning("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")