inspector: allow configuring always_store_ramdisk_logs
Change-Id: Ic2385603281a9c611d451bf0a99b80c9881bf2ac
This commit is contained in:
parent
1f694ff1a4
commit
731b563675
@ -60,6 +60,10 @@
|
||||
# (optional) Location to store logs retrieved from the ramdisk
|
||||
# Defaults to '/var/log/ironic-inspector/ramdisk/'
|
||||
#
|
||||
# [*always_store_ramdisk_logs*]
|
||||
# (optional) Whether to store ramdisk logs even for successful introspection.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*add_ports*]
|
||||
# (optional) Which MAC addresses to add as ports during introspection.
|
||||
# Allowed values: all, active, pxe.
|
||||
@ -229,6 +233,7 @@ class ironic::inspector (
|
||||
$dnsmasq_interface = 'br-ctlplane',
|
||||
$db_connection = undef,
|
||||
$ramdisk_logs_dir = '/var/log/ironic-inspector/ramdisk/',
|
||||
$always_store_ramdisk_logs = $::os_service_default,
|
||||
$add_ports = $::os_service_default,
|
||||
$keep_ports = 'all',
|
||||
$store_data = 'none',
|
||||
@ -347,6 +352,7 @@ class ironic::inspector (
|
||||
'capabilities/boot_mode': value => $detect_boot_mode;
|
||||
'firewall/dnsmasq_interface': value => $dnsmasq_interface;
|
||||
'processing/ramdisk_logs_dir': value => $ramdisk_logs_dir;
|
||||
'processing/always_store_ramdisk_logs': value => $always_store_ramdisk_logs;
|
||||
'processing/add_ports': value => $add_ports;
|
||||
'processing/keep_ports': value => $keep_ports;
|
||||
'processing/store_data': value => $store_data;
|
||||
|
@ -0,0 +1,3 @@
|
||||
features:
|
||||
- |
|
||||
Adds ``ironic::inspector::always_store_ramdisk_logs`` parameter.
|
@ -105,6 +105,7 @@ describe 'ironic::inspector' do
|
||||
is_expected.to contain_ironic_inspector_config('capabilities/boot_mode').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_inspector_config('firewall/dnsmasq_interface').with_value(p[:dnsmasq_interface])
|
||||
is_expected.to contain_ironic_inspector_config('processing/ramdisk_logs_dir').with_value(p[:ramdisk_logs_dir])
|
||||
is_expected.to contain_ironic_inspector_config('processing/always_store_ramdisk_logs').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_inspector_config('processing/add_ports').with_value(p[:add_ports])
|
||||
is_expected.to contain_ironic_inspector_config('processing/keep_ports').with_value(p[:keep_ports])
|
||||
is_expected.to contain_ironic_inspector_config('processing/store_data').with_value(p[:store_data])
|
||||
@ -196,6 +197,7 @@ describe 'ironic::inspector' do
|
||||
:dnsmasq_ip_subnets => [],
|
||||
:dnsmasq_ip_range => '192.168.0.100,192.168.0.120',
|
||||
:add_ports => 'all',
|
||||
:always_store_ramdisk_logs => true,
|
||||
)
|
||||
end
|
||||
it 'should replace default parameter with new value' do
|
||||
@ -214,6 +216,7 @@ describe 'ironic::inspector' do
|
||||
is_expected.to contain_ironic_inspector_config('processing/node_not_found_hook').with_value('enroll')
|
||||
is_expected.to contain_ironic_inspector_config('processing/add_ports').with_value('all')
|
||||
is_expected.to contain_ironic_inspector_config('discovery/enroll_node_driver').with_value('pxe_ipmitool')
|
||||
is_expected.to contain_ironic_inspector_config('processing/always_store_ramdisk_logs').with_value(true)
|
||||
end
|
||||
|
||||
it 'should contain file /etc/ironic-inspector/dnsmasq.conf' do
|
||||
|
Loading…
Reference in New Issue
Block a user