openstack
/
puppet-ironic
Code Issues Proposed changes

Remove default hardware type override 

Puppet-ironic ships with only the ipmi hardware type enabled.

This setting is possibly the most commonly overriden setting
used by operators and also prohibits the community determiend
default form just being used, which creates a friction point
between the two projects.

As such, it makes sense to remove, and just allow ironic's
default to be leveraged, by default.

Change-Id: I26b9eabd4c58b702ed18d6e8e21bd938908905a9
This commit is contained in:
Julia Kreger 2021-08-26 16:36:59 -07:00 committed by Takashi Kajinami
parent f761d8dc1e
commit 263afe8e6b
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/conductor.pp
View File

@ -29,7 +29,7 @@
#
# [*enabled_hardware_types*]
# (optional) Array of hardware types to load during service initialization.
# Defaults to ['ipmi'].
# Defaults to $::os_service_default
#
# [*force_power_state_during_sync*]
# (optional) Should the hardware power state be set to the state recorded in
@ -217,7 +217,7 @@
class ironic::conductor (
$package_ensure = 'present',
$enabled = true,
$enabled_hardware_types = ['ipmi'],
$enabled_hardware_types = $::os_service_default,
$force_power_state_during_sync = true,
$http_url = $::os_service_default,
$http_root = $::os_service_default,

7
releasenotes/notes/remove-default-hardware-types-override-f71919cbdc96b4f2.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
An explict ironic ``enabled_hardware_types`` setting has been removed
from ``puppet-ironic`` as it matches the Ironic default and the default
override prohibits inclusion of additional default enabled hardware types
the OpenStack Ironic project may choose to ship in the future.

3
spec/classes/ironic_conductor_spec.rb
View File

@ -25,7 +25,6 @@ describe 'ironic::conductor' do
let :default_params do
{ :package_ensure => 'present',
:enabled => true,
:enabled_hardware_types => ['ipmi'],
:force_power_state_during_sync => true }
end
@ -61,7 +60,7 @@ describe 'ironic::conductor' do
end
it 'configures ironic.conf' do
is_expected.to contain_ironic_config('DEFAULT/enabled_hardware_types').with_value('ipmi')
is_expected.to contain_ironic_config('DEFAULT/enabled_hardware_types').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/force_power_state_during_sync').with_value(p[:force_power_state_during_sync])
is_expected.to contain_ironic_config('conductor/automated_clean').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('neutron/cleaning_network').with(:value => '<SERVICE DEFAULT>')