openstack/puppet-ironic
Code Issues Proposed changes

Add parameter add_ports in ironic-inspector

Browse Source 
Change-Id: I86afd850c6a747974f56eb84bf1c965c02881e33
This commit is contained in:
Xingchao Yu
2017-04-26 11:31:36 +08:00
parent fc2adf7fb8
commit 1bf55a9f36
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/inspector.pp
View File

@ -55,6 +55,11 @@
# (optional) Location to store logs retrieved from the ramdisk
# Defaults to '/var/log/ironic-inspector/ramdisk/'
#
# [*add_ports*]
# (optional) Which MAC addresses to add as ports during introspection.
# Allowed values: all, active, pxe.
# Defaults to $::os_service_default
#
# [*keep_ports*]
# (optional) Which ports to keep after introspection
# Defaults to 'all'
@ -203,6 +208,7 @@
# [*dnsmasq_ip_range*]
# (optional) IP range to use for nodes being introspected
# Defaults to undef
#
class ironic::inspector (
$package_ensure = 'present',
$enabled = true,
@ -213,6 +219,7 @@ class ironic::inspector (
$dnsmasq_interface = 'br-ctlplane',
$db_connection = undef,
$ramdisk_logs_dir = '/var/log/ironic-inspector/ramdisk/',
$add_ports = $::os_service_default,
$keep_ports = 'all',
$store_data = 'none',
$ironic_auth_type = 'password',
@ -336,6 +343,7 @@ tftpboot and httpboot setup, please include ::ironic::pxe")
'firewall/dnsmasq_interface': value => $dnsmasq_interface;
'processing/ramdisk_logs_dir': value => $ramdisk_logs_dir;
'processing/enable_setting_ipmi_credentials': value => $enable_setting_ipmi_credentials;
'processing/add_ports': value => $add_ports;
'processing/keep_ports': value => $keep_ports;
'processing/store_data': value => $store_data;
'ironic/auth_type': value => $ironic_auth_type;

3
releasenotes/notes/add-inspector-parameters-add_ports-a254b910883edb08.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Add add_ports parameter in ironic-inspector service.

4
spec/classes/ironic_inspector_spec.rb
View File

@ -32,6 +32,7 @@ describe 'ironic::inspector' do
:auth_strategy => 'keystone',
:dnsmasq_interface => 'br-ctlplane',
:ramdisk_logs_dir => '/var/log/ironic-inspector/ramdisk/',
:add_ports => 'pxe',
:keep_ports => 'all',
:store_data => 'none',
:ironic_auth_type => 'password',
@ -104,6 +105,7 @@ describe 'ironic::inspector' do
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/enable_setting_ipmi_credentials').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])
is_expected.to contain_ironic_inspector_config('ironic/auth_type').with_value(p[:ironic_auth_type])
@ -191,6 +193,7 @@ describe 'ironic::inspector' do
:discovery_default_driver => 'pxe_ipmitool',
:dnsmasq_ip_subnets => [],
:dnsmasq_ip_range => '192.168.0.100,192.168.0.120',
:add_ports => 'all',
)
end
it 'should replace default parameter with new value' do
@ -207,6 +210,7 @@ describe 'ironic::inspector' do
is_expected.to contain_ironic_inspector_config('swift/auth_url').with_value(p[:swift_auth_url])
is_expected.to contain_ironic_inspector_config('processing/processing_hooks').with_value('$default_processing_hooks,hook1,hook2')
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')
end