From 993840def96672602d5f4d8d7da64cef9503959e Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Mon, 17 Sep 2018 15:06:03 +0200 Subject: [PATCH] Don't merge /etc/collectd.d During container image build there are several configuration files created via collectd plugin RPM installation, which are normally deleted in puppet-collectd workflow. Unfortunately the config directory, created by the Puppet module, is merged with the directory created during container image build, leaving invalid configuration files in resulting container, which can potentially cause a problem for collectd service. This patch disables the config dir merge. Change-Id: I2a5f3d1b6cc0b914d3beed1e9a5bd31470ac62e7 Closes-Bug: #1792926 (cherry picked from commit 905441bc0a2d5b16478c4ec179202c5c6c3befff) --- docker/services/metrics/collectd.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/services/metrics/collectd.yaml b/docker/services/metrics/collectd.yaml index 7441e696a6..99fec8aeb9 100644 --- a/docker/services/metrics/collectd.yaml +++ b/docker/services/metrics/collectd.yaml @@ -84,6 +84,10 @@ outputs: dest: "/" merge: true preserve_properties: true + - source: "/var/lib/kolla/config_files/src/etc/collectd.d" + dest: "/etc/" + merge: false + preserve_properties: true permissions: - path: /var/log/collectd owner: collectd:collectd