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
This commit is contained in:
parent
860c9a33f7
commit
905441bc0a
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue