openstack
/
puppet-gnocchi
Code Issues Proposed changes

Merge "Expect python3 client package in CentOS8"

This commit is contained in:
Zuul 2020-04-02 02:49:25 +00:00 committed by Gerrit Code Review
parent 5663d4972a a848d304be
commit 45d3cab76c
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spec/classes/gnocchi_client_spec.rb
View File

@ -27,7 +27,15 @@ describe 'gnocchi::client' do
when 'Debian'
{ :client_package_name => 'python3-gnocchiclient' }
when 'RedHat'
{ :client_package_name => 'python-gnocchiclient' }
if facts[:operatingsystem] == 'Fedora'
{ :client_package_name => 'python3-gnocchiclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package_name => 'python3-gnocchiclient' }
else
{ :client_package_name => 'python-gnocchiclient' }
end
end
end
end

18
spec/classes/gnocchi_init_spec.rb
View File

@ -71,9 +71,21 @@ describe 'gnocchi' do
:redis_package_name => 'python3-redis'
}
when 'RedHat'
{ :gnocchi_common_package => 'gnocchi-common',
:redis_package_name => 'python-redis'
}
if facts[:operatingsystem] == 'Fedora'
{ :gnocchi_common_package => 'gnocchi-common',
:redis_package_name => 'python3-redis'
}
else
if facts[:operatingsystemmajrelease] > '7'
{ :gnocchi_common_package => 'gnocchi-common',
:redis_package_name => 'python3-redis'
}
else
{ :gnocchi_common_package => 'gnocchi-common',
:redis_package_name => 'python-redis'
}
end
end
end
end
it_behaves_like 'gnocchi'