openstack/puppet-tripleo
Code Issues Proposed changes

Remove duplicate entry of collectd-python package

Browse Source 
672452018a
in puppet-collectd adds supports of CentOS-8 and collect-python
package is already defined there.

In puppet-tripleo, it started complaining about duplicate entry of
collectd-python package, removing the same fixes for puppet-tripleo
fixes the issue.

Closes-Bug: #1866965

Change-Id: If1a2c65c4208c2255a3140134204e240496ec8b6
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
(cherry picked from commit 3e8e98dde3)
This commit is contained in:
Chandan Kumar (raukadah) 2020-03-11 14:39:01 +05:30
parent cae687c599
commit 4cefed3c01
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/metrics/collectd.pp
View File

@ -281,7 +281,7 @@ class tripleo::profile::base::metrics::collectd (
logtraces => true, logtraces => true,
} }
$python_packages = concat(['collectd-python'], $python_read_plugins) $python_packages = $python_read_plugins
package { $python_packages: package { $python_packages:
ensure => 'present' ensure => 'present'
} }

3
spec/classes/tripleo_profile_base_metrics_collectd_spec.rb
View File

@ -58,9 +58,6 @@ describe 'tripleo::profile::base::metrics::collectd' do
is_expected.to contain_package('python-collectd-gnocchi').with( is_expected.to contain_package('python-collectd-gnocchi').with(
:ensure => 'present', :ensure => 'present',
) )
is_expected.to contain_package('collectd-python').with(
:ensure => 'present',
)
is_expected.to_not contain_class('epel') is_expected.to_not contain_class('epel')
is_expected.to_not contain_class('collectd::plugin::amqp1') is_expected.to_not contain_class('collectd::plugin::amqp1')
is_expected.to_not contain_class('collectd::plugin::logfile') is_expected.to_not contain_class('collectd::plugin::logfile')