openstack
/
puppet-swift
Code Issues Proposed changes

Fix name of ceilometer middleware package 

This change fixes the package name of ceilometermiddleware and ensures
that proper name (python- or python3-) is used according to the default
python version.

Change-Id: I7c99aaf5f02b29a5901aee3e1d9f581079375f17
This commit is contained in:
Thomas Goirand 2021-02-25 11:44:26 +01:00 committed by Takashi Kajinami
parent 35c905e430
commit ede897b112
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@ -34,6 +34,7 @@ class swift::params {
$account_auditor_service_name = 'swift-account-auditor'
$account_reaper_service_name = 'swift-account-reaper'
$account_replicator_service_name = 'swift-account-replicator'
$ceilometermiddleware_package_name = "python${pyvers}-ceilometermiddleware"
}
'RedHat': {
$package_name = 'openstack-swift'
@ -59,6 +60,7 @@ class swift::params {
$account_auditor_service_name = 'openstack-swift-account-auditor'
$account_reaper_service_name = 'openstack-swift-account-reaper'
$account_replicator_service_name = 'openstack-swift-account-replicator'
$ceilometermiddleware_package_name = "python${pyvers}-ceilometermiddleware"
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \

1
manifests/proxy/ceilometer.pp
View File

@ -206,6 +206,7 @@ Please set password parameter')
package { 'python-ceilometermiddleware':
ensure => $ensure,
name => $::swift::params::ceilometermiddleware_package_name,
tag => ['openstack', 'swift-support-package'],
}

24
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@ -21,6 +21,12 @@ describe 'swift::proxy::ceilometer' do
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/url').with_value('rabbit://user_1:user_1_passw@1.1.1.1:5673/rabbit').with_secret(true) }
it { is_expected.to contain_swift_proxy_config('filter:ceilometer/nonblocking_notify').with_value('false') }
it { is_expected.to contain_user('swift').with_groups('ceilometer') }
it { is_expected.to contain_package('python-ceilometermiddleware').with(
:ensure => 'present',
:name => platform_params[:ceilometermiddleware_package_name],
:tag => ['openstack', 'swift-support-package'],
)}
end
describe "when overriding default parameters with rabbit driver" do
@ -109,6 +115,24 @@ describe 'swift::proxy::ceilometer' do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
else
{ :ceilometermiddleware_package_name => 'python-ceilometermiddleware' }
end
end
end
end
it_behaves_like 'swift::proxy::ceilometer'
end
end