openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Remove duplicate entry of collectd-python package" into stable/train

This commit is contained in:
Zuul 2020-05-07 19:29:54 +00:00 committed by Gerrit Code Review
parent 3272375a33 4cefed3c01
commit 6006891aef
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,
}
$python_packages = concat(['collectd-python'], $python_read_plugins)
$python_packages = $python_read_plugins
package { $python_packages:
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(
: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')