From 263afe8e6b8b22549ac8aafd5b4ca3e85d5ad512 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Thu, 26 Aug 2021 16:36:59 -0700 Subject: [PATCH] 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 --- manifests/conductor.pp | 4 ++-- ...e-default-hardware-types-override-f71919cbdc96b4f2.yaml | 7 +++++++ spec/classes/ironic_conductor_spec.rb | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/remove-default-hardware-types-override-f71919cbdc96b4f2.yaml diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 6192b49a..7a2e25ba 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -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, diff --git a/releasenotes/notes/remove-default-hardware-types-override-f71919cbdc96b4f2.yaml b/releasenotes/notes/remove-default-hardware-types-override-f71919cbdc96b4f2.yaml new file mode 100644 index 00000000..1c90586c --- /dev/null +++ b/releasenotes/notes/remove-default-hardware-types-override-f71919cbdc96b4f2.yaml @@ -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. diff --git a/spec/classes/ironic_conductor_spec.rb b/spec/classes/ironic_conductor_spec.rb index 3b2453ce..1aebb063 100644 --- a/spec/classes/ironic_conductor_spec.rb +++ b/spec/classes/ironic_conductor_spec.rb @@ -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('') 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 => '') is_expected.to contain_ironic_config('neutron/cleaning_network').with(:value => '')