openstack
/
puppet-ironic
Code Issues Proposed changes

Merge "Remove default hardware type override"

This commit is contained in:
Zuul 2021-09-07 16:34:30 +00:00 committed by Gerrit Code Review
parent a4c67d9941 263afe8e6b
commit 77996ea30d
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>')