From ec3e34709231b3dd0b166db9c011c5ef4d66cd80 Mon Sep 17 00:00:00 2001 From: Saravanan KR <skramaja@redhat.com> Date: Tue, 24 Apr 2018 19:47:47 +0530 Subject: [PATCH] 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 --- docker/docker-puppet.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index 95649060da..f0d11eade4 100755 --- a/docker/docker-puppet.py +++ b/docker/docker-puppet.py @@ -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")