openstack/puppet-ironic
Code Issues Proposed changes

drac: Stop installing dracclient

Browse Source 
... because the old wsman interfaces were removed during this cycle.

Related-Bug: #2082235
Depends-on: https://review.opendev.org/922340
Change-Id: Id32a2663a988038652c184b192e407b73964c85c
This commit is contained in:
Takashi Kajinami 2024-09-26 23:01:54 +09:00
parent 1d055f7d00
commit fc5ca834f3
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/drivers/drac.pp
View File

@ -15,7 +15,7 @@
# === Parameters # === Parameters
# #
# [*package_ensure*] # [*package_ensure*]
# (optional) The state of the dracclient/sushy-oem-idrac package # (optional) The state of the sushy-oem-idrac package
# Defaults to 'present' # Defaults to 'present'
# #
class ironic::drivers::drac ( class ironic::drivers::drac (
@ -25,11 +25,6 @@ class ironic::drivers::drac (
include ironic::deps include ironic::deps
include ironic::params include ironic::params
package { 'python-dracclient':
ensure => $package_ensure,
name => $::ironic::params::dracclient_package_name,
tag => ['openstack', 'ironic-package'],
}
package { 'python-sushy-oem-idrac': package { 'python-sushy-oem-idrac':
ensure => $package_ensure, ensure => $package_ensure,
name => $::ironic::params::sushy_oem_idrac_package_name, name => $::ironic::params::sushy_oem_idrac_package_name,

1
manifests/params.pp
View File

@ -34,7 +34,6 @@ class ironic::params {
$inspector_group = 'ironic-inspector' $inspector_group = 'ironic-inspector'
$sushy_package_name = 'python3-sushy' $sushy_package_name = 'python3-sushy'
$proliantutils_package_name = 'python3-proliantutils' $proliantutils_package_name = 'python3-proliantutils'
$dracclient_package_name = 'python3-dracclient'
$sushy_oem_idrac_package_name = 'python3-sushy-oem-idrac' $sushy_oem_idrac_package_name = 'python3-sushy-oem-idrac'
case $facts['os']['family'] { case $facts['os']['family'] {

14
spec/classes/ironic_drivers_drac_spec.rb
View File

@ -23,14 +23,6 @@ describe 'ironic::drivers::drac' do
shared_examples_for 'ironic drac driver' do shared_examples_for 'ironic drac driver' do
it 'installs dracclient package' do
is_expected.to contain_package('python-dracclient').with(
:ensure => 'present',
:name => platform_params[:dracclient_package_name],
:tag => ['openstack', 'ironic-package'],
)
end
it 'installs sushy-oem-idrac package' do it 'installs sushy-oem-idrac package' do
is_expected.to contain_package('python-sushy-oem-idrac').with( is_expected.to contain_package('python-sushy-oem-idrac').with(
:ensure => 'present', :ensure => 'present',
@ -51,11 +43,9 @@ describe 'ironic::drivers::drac' do
let (:platform_params) do let (:platform_params) do
case facts[:os]['family'] case facts[:os]['family']
when 'Debian' when 'Debian'
{ :dracclient_package_name => 'python3-dracclient', { :sushy_oem_idrac_package_name => 'python3-sushy-oem-idrac' }
:sushy_oem_idrac_package_name => 'python3-sushy-oem-idrac' }
when 'RedHat' when 'RedHat'
{ :dracclient_package_name => 'python3-dracclient', { :sushy_oem_idrac_package_name => 'python3-sushy-oem-idrac' }
:sushy_oem_idrac_package_name => 'python3-sushy-oem-idrac' }
end end
end end