After deploying overcloud with collectd support I see duplicate plugin files in the collectd container

[Leonid Natapov]

After deploying overcloud with collectd support I see duplicate plugin files in the collectd container

/etc/collectd.d/ diectory looks like this:

    ()[root@controller-0 /]# cd /etc/collectd.d/
    ()[root@controller-0 collectd.d]# ls -al
    total 56
    drwxr-x---. 1 root root 172 Feb 14 16:24 .
    drwxr-xr-x. 1 root root 45 Feb 14 16:24 ..
    -rw-r-----. 1 root root 431 Feb 14 16:10 00-python.conf
    -rw-r-----. 1 root root 197 Feb 14 16:10 05-logfile.conf
    -rw-r-----. 1 root root 119 Feb 14 16:10 10-load.conf
    -rw-r-----. 1 root root 179 Feb 14 16:10 10-memcached.conf
    -rw-r-----. 1 root root 147 Feb 14 16:10 10-memory.conf
    -rw-r-----. 1 root root 77 Feb 14 16:10 10-processes.conf
    -rw-r--r--. 1 collectd root 15 Dec 21 12:09 90-default-plugins-cpu.conf
    -rw-r--r--. 1 collectd root 21 Dec 21 12:09 90-default-plugins-interface.conf
    -rw-r--r--. 1 collectd root 16 Dec 21 12:09 90-default-plugins-load.conf
    -rw-r--r--. 1 collectd root 18 Dec 21 12:09 90-default-plugins-memory.conf
    -rw-r--r--. 1 collectd root 18 Dec 21 12:09 90-default-plugins-syslog.conf
    -rw-r--r--. 1 collectd root 168 Dec 21 12:09 apache.conf
    -rw-r--r--. 1 collectd root 19 Dec 21 12:09 libvirt.conf
    -rw-r-----. 1 root root 29 Feb 14 16:10 processes-config.conf

-----

for example the content of 10-load.conf vs the content of 90-default-plugins-load.conf:

10-load.conf
----------------------
# Generated by Puppet
<LoadPlugin load>
  Globals false
</LoadPlugin>

<Plugin load>
  ReportRelative false
</Plugin>

90-default-plugins-load.conf
-----------------------------
LoadPlugin load

all others are the same manner.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/603123

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/603123
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=905441bc0a2d5b16478c4ec179202c5c6c3befff
Submitter: Zuul
Branch: master

commit 905441bc0a2d5b16478c4ec179202c5c6c3befff
Author: Martin Magr <email address hidden>
Date: Mon Sep 17 15:06:03 2018 +0200

    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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/rocky
Review: https://review.openstack.org/606961

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/queens
Review: https://review.openstack.org/606963

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/606961
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=993840def96672602d5f4d8d7da64cef9503959e
Submitter: Zuul
Branch: stable/rocky

commit 993840def96672602d5f4d8d7da64cef9503959e
Author: Martin Magr <email address hidden>
Date: Mon Sep 17 15:06:03 2018 +0200

    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)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/606963
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=cfc4ab2181c61443a306f61e0d6ddaf619ef9161
Submitter: Zuul
Branch: stable/queens

commit cfc4ab2181c61443a306f61e0d6ddaf619ef9161
Author: Martin Magr <email address hidden>
Date: Mon Sep 17 15:06:03 2018 +0200

    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)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 10.0.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 8.1.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 9.1.0 release.