Merge "Expect python3 client/lib package in CentOS8"
This commit is contained in:
commit
e3a8200dcf
|
@ -30,7 +30,7 @@ describe 'ironic::client' do
|
||||||
it 'installs ironic client package' do
|
it 'installs ironic client package' do
|
||||||
is_expected.to contain_package('python-ironicclient').with(
|
is_expected.to contain_package('python-ironicclient').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:name => platform_params[:client_package_name],
|
:name => platform_params[:client_package],
|
||||||
:tag => ['openstack', 'ironic-support-package']
|
:tag => ['openstack', 'ironic-support-package']
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
@ -49,9 +49,17 @@ describe 'ironic::client' do
|
||||||
let(:platform_params) do
|
let(:platform_params) do
|
||||||
case facts[:osfamily]
|
case facts[:osfamily]
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
{ :client_package_name => 'python3-ironicclient' }
|
{ :client_package => 'python3-ironicclient' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :client_package_name => 'python-ironicclient' }
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
|
{ :client_package => 'python3-ironicclient' }
|
||||||
|
else
|
||||||
|
if facts[:operatingsystemmajrelease] > '7'
|
||||||
|
{ :client_package => 'python3-ironicclient' }
|
||||||
|
else
|
||||||
|
{ :client_package => 'python-ironicclient' }
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,15 @@ describe 'ironic::drivers::drac' do
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
{ :dracclient_package_name => 'python3-dracclient' }
|
{ :dracclient_package_name => 'python3-dracclient' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :dracclient_package_name => 'python-dracclient' }
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
|
{ :dracclient_package_name => 'python3-dracclient' }
|
||||||
|
else
|
||||||
|
if facts[:operatingsystemmajrelease] > '7'
|
||||||
|
{ :dracclient_package_name => 'python3-dracclient' }
|
||||||
|
else
|
||||||
|
{ :dracclient_package_name => 'python-dracclient' }
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,15 @@ describe 'ironic::drivers::ilo' do
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
{ :proliantutils_package_name => 'python3-proliantutils' }
|
{ :proliantutils_package_name => 'python3-proliantutils' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :proliantutils_package_name => 'python-proliantutils' }
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
|
{ :proliantutils_package_name => 'python3-proliantutils' }
|
||||||
|
else
|
||||||
|
if facts[:operatingsystemmajrelease] > '7'
|
||||||
|
{ :proliantutils_package_name => 'python3-proliantutils' }
|
||||||
|
else
|
||||||
|
{ :proliantutils_package_name => 'python-proliantutils' }
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,15 @@ describe 'ironic::drivers::redfish' do
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
{ :sushy_package_name => 'python3-sushy' }
|
{ :sushy_package_name => 'python3-sushy' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :sushy_package_name => 'python-sushy' }
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
|
{ :sushy_package_name => 'python3-sushy' }
|
||||||
|
else
|
||||||
|
if facts[:operatingsystemmajrelease] > '7'
|
||||||
|
{ :sushy_package_name => 'python3-sushy' }
|
||||||
|
else
|
||||||
|
{ :sushy_package_name => 'python-sushy' }
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -281,8 +281,19 @@ describe 'ironic' do
|
||||||
{ :common_package_name => 'ironic-common',
|
{ :common_package_name => 'ironic-common',
|
||||||
:lib_package_name => 'python3-ironic-lib' }
|
:lib_package_name => 'python3-ironic-lib' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :common_package_name => 'openstack-ironic-common',
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
:lib_package_name => 'python-ironic-lib' }
|
{ :common_package_name => 'openstack-ironic-common',
|
||||||
|
:lib_package_name => 'python3-ironic-lib' }
|
||||||
|
else
|
||||||
|
if facts[:operatingsystemmajrelease] > '7'
|
||||||
|
{ :common_package_name => 'openstack-ironic-common',
|
||||||
|
:lib_package_name => 'python3-ironic-lib' }
|
||||||
|
else
|
||||||
|
{ :common_package_name => 'openstack-ironic-common',
|
||||||
|
:lib_package_name => 'python-ironic-lib' }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ describe 'ironic::inspector::client' do
|
||||||
it 'installs ironic inspector client package' do
|
it 'installs ironic inspector client package' do
|
||||||
is_expected.to contain_package('python-ironic-inspector-client').with(
|
is_expected.to contain_package('python-ironic-inspector-client').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:name => platform_params[:ironic_inspector_client_package_name],
|
:name => platform_params[:inspector_client_package],
|
||||||
:tag => ['openstack', 'ironic-support-package'],
|
:tag => ['openstack', 'ironic-support-package'],
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
@ -54,9 +54,17 @@ describe 'ironic::inspector::client' do
|
||||||
let (:platform_params) do
|
let (:platform_params) do
|
||||||
case facts[:osfamily]
|
case facts[:osfamily]
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
{ :ironic_inspector_client_package_name => 'python3-ironic-inspector-client' }
|
{ :inspector_client_package => 'python3-ironic-inspector-client' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :ironic_inspector_client_package_name => 'python-ironic-inspector-client' }
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
|
{ :inspector_client_package => 'python3-ironic-inspector-client' }
|
||||||
|
else
|
||||||
|
if facts[:operatingsystemmajrelease] > '7'
|
||||||
|
{ :inspector_client_package => 'python3-ironic-inspector-client' }
|
||||||
|
else
|
||||||
|
{ :inspector_client_package => 'python-ironic-inspector-client' }
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue