diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 62cc0b35..1d18997e 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -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$']]) diff --git a/spec/classes/ironic_conductor_spec.rb b/spec/classes/ironic_conductor_spec.rb index c9590385..3b2453ce 100644 --- a/spec/classes/ironic_conductor_spec.rb +++ b/spec/classes/ironic_conductor_spec.rb @@ -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' }