From c1e2c28efe66bd0158ceace1bc15173418721113 Mon Sep 17 00:00:00 2001 From: yatin Date: Thu, 27 Sep 2018 21:47:53 +0530 Subject: [PATCH] Update cinder packages name for Fedora and RedHat > 7 For Fedora use python3 packages. Cinder python3 packages are now available at [1]. [1] https://trunk.rdoproject.org/fedora/current/ Change-Id: Idaeb8f70bdc407f3fedb60b07aef616bcc72c195 --- manifests/params.pp | 3 ++- spec/classes/cinder_init_spec.rb | 1 + spec/classes/cinder_scheduler_spec.rb | 10 ++++++++-- spec/classes/cinder_volume_spec.rb | 5 ++++- spec/defines/cinder_backend_emc_vnx_spec.rb | 5 ++++- spec/defines/cinder_backend_iscsi_spec.rb | 10 ++++++++-- spec/defines/cinder_backend_nvmeof_spec.rb | 5 ++++- spec/defines/cinder_backend_rbd_spec.rb | 10 ++++++++-- 8 files changed, 39 insertions(+), 10 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index edd7f7c1..23988e64 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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 = '' diff --git a/spec/classes/cinder_init_spec.rb b/spec/classes/cinder_init_spec.rb index 487c5fc8..6ef4a24d 100644 --- a/spec/classes/cinder_init_spec.rb +++ b/spec/classes/cinder_init_spec.rb @@ -13,6 +13,7 @@ describe 'cinder' do :osfamily => 'Debian', :operatingsystem => 'Debian', :operatingsystemrelease => 'jessie', + :os => { :name => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } }, }) end diff --git a/spec/classes/cinder_scheduler_spec.rb b/spec/classes/cinder_scheduler_spec.rb index 11452f33..9c44188a 100644 --- a/spec/classes/cinder_scheduler_spec.rb +++ b/spec/classes/cinder_scheduler_spec.rb @@ -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 diff --git a/spec/classes/cinder_volume_spec.rb b/spec/classes/cinder_volume_spec.rb index 00d8f1c5..a147d3e3 100644 --- a/spec/classes/cinder_volume_spec.rb +++ b/spec/classes/cinder_volume_spec.rb @@ -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') } diff --git a/spec/defines/cinder_backend_emc_vnx_spec.rb b/spec/defines/cinder_backend_emc_vnx_spec.rb index 735406c5..8160144f 100644 --- a/spec/defines/cinder_backend_emc_vnx_spec.rb +++ b/spec/defines/cinder_backend_emc_vnx_spec.rb @@ -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 diff --git a/spec/defines/cinder_backend_iscsi_spec.rb b/spec/defines/cinder_backend_iscsi_spec.rb index 68fc6e56..c4ecf3c7 100644 --- a/spec/defines/cinder_backend_iscsi_spec.rb +++ b/spec/defines/cinder_backend_iscsi_spec.rb @@ -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( diff --git a/spec/defines/cinder_backend_nvmeof_spec.rb b/spec/defines/cinder_backend_nvmeof_spec.rb index 6aa66459..3ce14c0e 100644 --- a/spec/defines/cinder_backend_nvmeof_spec.rb +++ b/spec/defines/cinder_backend_nvmeof_spec.rb @@ -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 diff --git a/spec/defines/cinder_backend_rbd_spec.rb b/spec/defines/cinder_backend_rbd_spec.rb index 30658702..b81f535c 100644 --- a/spec/defines/cinder_backend_rbd_spec.rb +++ b/spec/defines/cinder_backend_rbd_spec.rb @@ -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