Removed deprecated support for setting IPMI credentials
Closes-Bug: #1654318 Change-Id: Idc613717cfbeabc173ef5853c08d97a273913c12
This commit is contained in:
parent
100f4341d9
commit
d86a38c7ef
|
@ -209,10 +209,6 @@
|
|||
#
|
||||
# DEPRECATED
|
||||
#
|
||||
# [*enable_setting_ipmi_credentials*]
|
||||
# (optional) Enable setting of IPMI credentials
|
||||
# Defaults to $::os::service_default
|
||||
#
|
||||
# [*dnsmasq_ip_range*]
|
||||
# (optional) IP range to use for nodes being introspected
|
||||
# Defaults to undef
|
||||
|
@ -263,7 +259,6 @@ class ironic::inspector (
|
|||
$discovery_default_driver = $::os_service_default,
|
||||
# DEPRECATED
|
||||
$dnsmasq_ip_range = undef,
|
||||
$enable_setting_ipmi_credentials = $::os_service_default,
|
||||
) {
|
||||
|
||||
include ::ironic::deps
|
||||
|
@ -276,10 +271,6 @@ class ironic::inspector (
|
|||
include ::ironic::inspector::authtoken
|
||||
}
|
||||
|
||||
if !is_service_default($enable_setting_ipmi_credentials) {
|
||||
warning('enable_setting_ipmi_credentials is deprecated')
|
||||
}
|
||||
|
||||
if !is_array($dnsmasq_ip_subnets) {
|
||||
fail('Invalid data type, parameter dnsmasq_ip_subnets must be Array type')
|
||||
}
|
||||
|
@ -349,7 +340,6 @@ 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/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;
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
The deprecated parameter ``inspector::enable_setting_ipmi_credentials``
|
||||
was removed. This feature was already removed from ironic-inspector.
|
|
@ -104,7 +104,6 @@ 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/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])
|
||||
|
|
Loading…
Reference in New Issue