openstack/puppet-ironic
Code Issues Proposed changes

Skip installation of python3-sushy-oem-idrac

Browse Source 
This separate package is no longer required, because the library code
was imported into the sushy library [1] and ironic started using that
imported code as a primary implementation[2]

[1] da092394650e952d1991f24f13403b5e020567d9
[2] e443ddcb92f37ea116ea077cc714e6509409ee51

Change-Id: I48711e7d29f6d936b9e1cf12f77e4db76a70f2bf
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-12-12 03:07:42 +09:00
parent 7fd53e3c3a
commit 9ca4172393
4 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/drivers/drac.pp
View File

@@ -14,10 +14,6 @@
#
# === Parameters
#
# [*package_ensure*]
# (optional) The state of the sushy-oem-idrac package
# Defaults to 'present'
#
# [*query_raid_config_job_status_interval*]
# (optional) Interval (in seconds) between periodic RAID job status checks.
# Defaults to $facts['os_service_default']
@@ -48,8 +44,11 @@
# settings to complete.
# Defaults to undef
#
# [*package_ensure*]
# (optional) The state of the sushy-oem-idrac package
# Defaults to undef
#
class ironic::drivers::drac (
Stdlib::Ensure::Package $package_ensure = 'present',
$query_raid_config_job_status_interval = $facts['os_service_default'],
$boot_device_job_status_timeout = $facts['os_service_default'],
$query_import_config_job_status_interval = $facts['os_service_default'],
@@ -57,6 +56,7 @@ class ironic::drivers::drac (
# DEPRECATED PARAMETERS
$config_job_max_retries = undef,
$bios_factory_reset_timeout = undef,
$package_ensure = undef
) {
include ironic::deps
include ironic::params
@@ -64,6 +64,7 @@ class ironic::drivers::drac (
[
'config_job_max_retries',
'bios_factory_reset_timeout',
'package_ensure',
].each |String $deprecated_param| {
if getvar($deprecated_param) != undef {
warning("The ${deprecated_param} parameter is deprecated and has no effect.")
@@ -82,10 +83,4 @@ class ironic::drivers::drac (
'drac/config_job_max_retries': ensure => absent;
'drac/bios_factory_reset_timeout': ensure => absent;
}
package { 'python-sushy-oem-idrac':
ensure => $package_ensure,
name => $ironic::params::sushy_oem_idrac_package_name,
tag => ['openstack', 'ironic-package'],
}
}

1
manifests/params.pp
View File

@@ -30,7 +30,6 @@ class ironic::params {
$group = 'ironic'
$sushy_package_name = 'python3-sushy'
$proliantutils_package_name = 'python3-proliantutils'
$sushy_oem_idrac_package_name = 'python3-sushy-oem-idrac'
case $facts['os']['family'] {
'RedHat': {

7
releasenotes/notes/drop-python3-sushy-oem-idrac-c8afb7835cd68cc0.yaml Normal file
View File

@@ -0,0 +1,7 @@
---
deprecations:
- |
The ``ironic::drivers::drac::package_ensure`` parameter is deprecated
and has no effect now. The ``ironic::drivers::drac`` class no longer
installs the ``python3-sushy-oem-idrac``, because this package is no longer
used by ironic.

17
spec/classes/ironic_drivers_drac_spec.rb
View File

@@ -25,14 +25,6 @@ describe 'ironic::drivers::drac' do
is_expected.to contain_ironic_config('drac/query_import_config_job_status_interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('drac/raid_job_timeout').with_value('<SERVICE DEFAULT>')
end
it 'installs sushy-oem-idrac package' do
is_expected.to contain_package('python-sushy-oem-idrac').with(
:ensure => 'present',
:name => platform_params[:sushy_oem_idrac_package_name],
:tag => ['openstack', 'ironic-package'],
)
end
end
context 'with parameters' do
@@ -62,15 +54,6 @@ describe 'ironic::drivers::drac' do
facts.merge!(OSDefaults.get_facts())
end
let (:platform_params) do
case facts[:os]['family']
when 'Debian'
{ :sushy_oem_idrac_package_name => 'python3-sushy-oem-idrac' }
when 'RedHat'
{ :sushy_oem_idrac_package_name => 'python3-sushy-oem-idrac' }
end
end
it_behaves_like 'ironic drac driver'
end
end