openstack/puppet-ironic
Code Issues Proposed changes

Merge "inspector: Add support for [DEFAULT] host"

Browse Source
This commit is contained in:
Zuul
2025-08-25 19:47:14 +00:00
committed by Gerrit Code Review
parent 70763fe1bc 8b27356a1b
commit b48dbc7550
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/inspector.pp
View File

@@ -29,6 +29,10 @@
# (optional) Define if the service must be enabled or not # (optional) Define if the service must be enabled or not
# Defaults to true # Defaults to true
# #
# [*host*]
# (optional) Name of this node.
# Defaults to $facts['os_service_default'].
#
# [*listen_address*] # [*listen_address*]
# (optional) The listen IP for the Ironic-inspector API server. # (optional) The listen IP for the Ironic-inspector API server.
# Should be an valid IP address # Should be an valid IP address
@@ -341,6 +345,7 @@ class ironic::inspector (
$package_ensure = 'present', $package_ensure = 'present',
Boolean $manage_service = true, Boolean $manage_service = true,
Boolean $enabled = true, Boolean $enabled = true,
$host = $facts['os_service_default'],
$listen_address = $facts['os_service_default'], $listen_address = $facts['os_service_default'],
Enum['http', 'tftp'] $pxe_transfer_protocol = 'tftp', Enum['http', 'tftp'] $pxe_transfer_protocol = 'tftp',
Boolean $dhcp_debug = false, Boolean $dhcp_debug = false,
@@ -493,6 +498,7 @@ class ironic::inspector (
} }
ironic_inspector_config { ironic_inspector_config {
'DEFAULT/host': value => $host;
'DEFAULT/listen_address': value => $listen_address; 'DEFAULT/listen_address': value => $listen_address;
'DEFAULT/auth_strategy': value => $auth_strategy; 'DEFAULT/auth_strategy': value => $auth_strategy;
'DEFAULT/timeout': value => $timeout; 'DEFAULT/timeout': value => $timeout;

4
releasenotes/notes/inspector-host-3c1373612b0e37c3.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
features:
- |
The new ``ironic::inspector::host`` parameter has been added.

3
spec/classes/ironic_inspector_spec.rb
View File

@@ -108,6 +108,7 @@ describe 'ironic::inspector' do
end end
it 'configures inspector.conf' do it 'configures inspector.conf' do
is_expected.to contain_ironic_inspector_config('DEFAULT/host').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('DEFAULT/listen_address').with_value('<SERVICE DEFAULT>') is_expected.to contain_ironic_inspector_config('DEFAULT/listen_address').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('DEFAULT/auth_strategy').with_value(p[:auth_strategy]) is_expected.to contain_ironic_inspector_config('DEFAULT/auth_strategy').with_value(p[:auth_strategy])
is_expected.to contain_ironic_inspector_config('DEFAULT/timeout').with_value('<SERVICE DEFAULT>') is_expected.to contain_ironic_inspector_config('DEFAULT/timeout').with_value('<SERVICE DEFAULT>')
@@ -224,6 +225,7 @@ describe 'ironic::inspector' do
before :each do before :each do
params.merge!( params.merge!(
:dhcp_debug => true, :dhcp_debug => true,
:host => 'localhost',
:listen_address => '127.0.0.1', :listen_address => '127.0.0.1',
:api_max_limit => 100, :api_max_limit => 100,
:pxe_transfer_protocol => 'http', :pxe_transfer_protocol => 'http',
@@ -273,6 +275,7 @@ describe 'ironic::inspector' do
) )
end end
it 'should replace default parameter with new value' do it 'should replace default parameter with new value' do
is_expected.to contain_ironic_inspector_config('DEFAULT/host').with_value(p[:host])
is_expected.to contain_ironic_inspector_config('DEFAULT/listen_address').with_value(p[:listen_address]) is_expected.to contain_ironic_inspector_config('DEFAULT/listen_address').with_value(p[:listen_address])
is_expected.to contain_ironic_inspector_config('DEFAULT/api_max_limit').with_value(100) is_expected.to contain_ironic_inspector_config('DEFAULT/api_max_limit').with_value(100)
is_expected.to contain_ironic_inspector_config('capabilities/boot_mode').with_value(p[:detect_boot_mode]) is_expected.to contain_ironic_inspector_config('capabilities/boot_mode').with_value(p[:detect_boot_mode])