From fc5ca834f374fe046204c000aacd394ae51457db Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 26 Sep 2024 23:01:54 +0900 Subject: [PATCH] drac: Stop installing dracclient ... because the old wsman interfaces were removed during this cycle. Related-Bug: #2082235 Depends-on: https://review.opendev.org/922340 Change-Id: Id32a2663a988038652c184b192e407b73964c85c --- manifests/drivers/drac.pp | 7 +------ manifests/params.pp | 1 - spec/classes/ironic_drivers_drac_spec.rb | 14 ++------------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/manifests/drivers/drac.pp b/manifests/drivers/drac.pp index 050398db..099edb05 100644 --- a/manifests/drivers/drac.pp +++ b/manifests/drivers/drac.pp @@ -15,7 +15,7 @@ # === Parameters # # [*package_ensure*] -# (optional) The state of the dracclient/sushy-oem-idrac package +# (optional) The state of the sushy-oem-idrac package # Defaults to 'present' # class ironic::drivers::drac ( @@ -25,11 +25,6 @@ class ironic::drivers::drac ( include ironic::deps include ironic::params - package { 'python-dracclient': - ensure => $package_ensure, - name => $::ironic::params::dracclient_package_name, - tag => ['openstack', 'ironic-package'], - } package { 'python-sushy-oem-idrac': ensure => $package_ensure, name => $::ironic::params::sushy_oem_idrac_package_name, diff --git a/manifests/params.pp b/manifests/params.pp index 53f3d1cb..d2d5a846 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -34,7 +34,6 @@ class ironic::params { $inspector_group = 'ironic-inspector' $sushy_package_name = 'python3-sushy' $proliantutils_package_name = 'python3-proliantutils' - $dracclient_package_name = 'python3-dracclient' $sushy_oem_idrac_package_name = 'python3-sushy-oem-idrac' case $facts['os']['family'] { diff --git a/spec/classes/ironic_drivers_drac_spec.rb b/spec/classes/ironic_drivers_drac_spec.rb index 5952e9cf..e9b3ad82 100644 --- a/spec/classes/ironic_drivers_drac_spec.rb +++ b/spec/classes/ironic_drivers_drac_spec.rb @@ -23,14 +23,6 @@ describe 'ironic::drivers::drac' 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 is_expected.to contain_package('python-sushy-oem-idrac').with( :ensure => 'present', @@ -51,11 +43,9 @@ describe 'ironic::drivers::drac' do let (:platform_params) do case facts[:os]['family'] 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' - { :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