Merge "Update cinder packages name for Fedora and RedHat > 7"

This commit is contained in:
Zuul 2018-10-10 13:11:38 +00:00 committed by Gerrit Code Review
commit ab08dd1721
8 changed files with 39 additions and 10 deletions

View File

@ -5,7 +5,8 @@
class cinder::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') {
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''

View File

@ -13,6 +13,7 @@ describe 'cinder' do
:osfamily => 'Debian',
:operatingsystem => 'Debian',
:operatingsystemrelease => 'jessie',
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
})
end

View File

@ -5,7 +5,10 @@ describe 'cinder::scheduler' do
describe 'on debian platforms' do
let :facts do
OSDefaults.get_facts({ :osfamily => 'Debian' })
OSDefaults.get_facts({
:osfamily => 'Debian',
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
})
end
describe 'with default parameters' do
@ -55,7 +58,10 @@ describe 'cinder::scheduler' do
describe 'on rhel platforms' do
let :facts do
OSDefaults.get_facts({ :osfamily => 'RedHat' })
OSDefaults.get_facts({
:osfamily => 'RedHat',
:os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
})
end
describe 'with default parameters' do

View File

@ -7,7 +7,10 @@ describe 'cinder::volume' do
end
let :facts do
OSDefaults.get_facts({:osfamily => 'Debian'})
OSDefaults.get_facts({
:osfamily => 'Debian',
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
})
end
it { is_expected.to contain_package('cinder-volume').with_ensure('present') }

View File

@ -13,7 +13,10 @@ describe 'cinder::backend::emc_vnx' do
end
let :facts do
OSDefaults.get_facts({:osfamily => 'Redhat' })
OSDefaults.get_facts({
:osfamily => 'Redhat',
:os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
})
end
let :params do

View File

@ -11,7 +11,10 @@ describe 'cinder::backend::iscsi' do
end
let :facts do
OSDefaults.get_facts({:osfamily => 'Debian'})
OSDefaults.get_facts({
:osfamily => 'Debian',
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
})
end
let :params do
@ -93,7 +96,10 @@ describe 'cinder::backend::iscsi' do
describe 'with RedHat' do
let :facts do
OSDefaults.get_facts({:osfamily => 'RedHat'})
OSDefaults.get_facts({
:osfamily => 'RedHat',
:os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
})
end
it { is_expected.to contain_file_line('cinder include').with(

View File

@ -13,7 +13,10 @@ describe 'cinder::backend::nvmeof' do
end
let :facts do
OSDefaults.get_facts({:osfamily => 'Debian'})
OSDefaults.get_facts({
:osfamily => 'Debian',
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
})
end
let :params do

View File

@ -31,7 +31,10 @@ describe 'cinder::backend::rbd' do
end
let :facts do
@default_facts.merge({:osfamily => 'Debian'})
@default_facts.merge({
:osfamily => 'Debian',
:os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
})
end
describe 'rbd backend volume driver' do
@ -109,7 +112,10 @@ describe 'cinder::backend::rbd' do
describe 'with RedHat' do
let :facts do
@default_facts.merge({ :osfamily => 'RedHat' })
@default_facts.merge({
:osfamily => 'RedHat',
:os => { :name => 'CentOS', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
})
end
let :params do