From 4cefed3c01311a79079434e74150db838d7a9950 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Wed, 11 Mar 2020 14:39:01 +0530 Subject: [PATCH] Remove duplicate entry of collectd-python package https://github.com/voxpupuli/puppet-collectd/commit/672452018abefde44f18de9cb75a3102e0745f61 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) (cherry picked from commit 3e8e98dde34a42894f075ad27a34957a7c76b116) --- manifests/profile/base/metrics/collectd.pp | 2 +- spec/classes/tripleo_profile_base_metrics_collectd_spec.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/manifests/profile/base/metrics/collectd.pp b/manifests/profile/base/metrics/collectd.pp index 564d84955..6ef9be5f3 100644 --- a/manifests/profile/base/metrics/collectd.pp +++ b/manifests/profile/base/metrics/collectd.pp @@ -281,7 +281,7 @@ class tripleo::profile::base::metrics::collectd ( logtraces => true, } - $python_packages = concat(['collectd-python'], $python_read_plugins) + $python_packages = $python_read_plugins package { $python_packages: ensure => 'present' } diff --git a/spec/classes/tripleo_profile_base_metrics_collectd_spec.rb b/spec/classes/tripleo_profile_base_metrics_collectd_spec.rb index 81d87530c..dae3c3bdd 100644 --- a/spec/classes/tripleo_profile_base_metrics_collectd_spec.rb +++ b/spec/classes/tripleo_profile_base_metrics_collectd_spec.rb @@ -58,9 +58,6 @@ describe 'tripleo::profile::base::metrics::collectd' do is_expected.to contain_package('python-collectd-gnocchi').with( :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('collectd::plugin::amqp1') is_expected.to_not contain_class('collectd::plugin::logfile')