openstack
/
puppet-glare
Code Issues Proposed changes

Expect python3 client package in CentOS8 

In CentOS, we expect to have python3 client package in 8.x while we
expect to have python2 in 7.x .
Fix unit tests to expect the correct version according to os major
version.

Note that this patch also removes broken unit tests which overrides
os release information to test el6 and el7.

Change-Id: I7437538596ad8a5d8a591b629c6982309a25514c
This commit is contained in:
Takashi Kajinami 2020-03-31 22:24:22 +09:00
parent e1fa8edc6b
commit b0f16625f5
2 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
spec/classes/glare_backend_rbd_spec.rb
View File

@ -47,30 +47,6 @@ describe 'glare::backend::rbd' do
end
end
shared_examples 'glare::backend::rbd on RedHat' do
context 'with el6' do
before do
facts.merge!( :operatingsystemrelease => '6.5' )
end
it { should contain_package('python-ceph').with(
:name => 'python-ceph',
:ensure => 'present'
)}
end
context 'with el7' do
before do
facts.merge!( :operatingsystemrelease => '7.0' )
end
it { should contain_package('python-ceph').with(
:name => 'python-rbd',
:ensure => 'present'
)}
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
@ -87,21 +63,21 @@ describe 'glare::backend::rbd' do
else
pyceph_pkg = 'python-ceph'
end
{
:pyceph_package_name => pyceph_pkg,
}
{ :pyceph_package_name => pyceph_pkg, }
when 'RedHat'
{
:pyceph_package_name => 'python-rbd',
}
if facts[:operatingsystem] == 'Fedora'
{ :pyceph_package_name => 'python3-rbd' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :pyceph_package_name => 'python3-rbd' }
else
{ :pyceph_package_name => 'python-rbd' }
end
end
end
end
it_behaves_like 'glare::backend::rbd'
if facts[:osfamily] == 'RedHat'
it_behaves_like 'glare::backend::rbd on RedHat'
end
end
end
end

10
spec/classes/glare_client_spec.rb
View File

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