Merge "Remove unnecessary workaround for missing ipmitool dependency"

This commit is contained in:
Zuul 2021-09-02 18:28:10 +00:00 committed by Gerrit Code Review
commit 9efa9c818c
2 changed files with 0 additions and 19 deletions

View File

@ -308,17 +308,6 @@ Use inspect_wait_timeout instead')
# including its manifest (which only contains configuration options)
include ironic::drivers::agent
# On Ubuntu, ipmitool dependency is missing and ironic-conductor fails to start.
# https://bugs.launchpad.net/cloud-archive/+bug/1572800
if member($enabled_hardware_types, 'ipmi') and $::osfamily == 'Debian' {
ensure_packages('ipmitool',
{
ensure => $package_ensure,
tag => ['openstack', 'ironic-package'],
}
)
}
if $cleaning_disk_erase {
validate_legacy(Enum['full', 'metadata', 'none'], 'validate_re', $cleaning_disk_erase,
[['^full$', '^metadata$', '^none$']])

View File

@ -188,14 +188,6 @@ describe 'ironic::conductor' do
{ :conductor_package => 'ironic-conductor',
:conductor_service => 'ironic-conductor' }
end
# https://bugs.launchpad.net/cloud-archive/+bug/1572800
it 'installs ipmitool package' do
is_expected.to contain_package('ipmitool').with(
:ensure => 'present',
:name => 'ipmitool',
:tag => ['openstack', 'ironic-package'],
)
end
when 'RedHat'
let :platform_params do
{ :conductor_service => 'ironic-conductor' }