openstack/puppet-ironic
Code Issues Proposed changes

Removed deprecated support for setting IPMI credentials

Browse Source 
Closes-Bug: #1654318
Change-Id: Idc613717cfbeabc173ef5853c08d97a273913c12
This commit is contained in:
Dmitry Tantsur
2017-09-19 14:09:00 +02:00
parent 100f4341d9
commit d86a38c7ef
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/inspector.pp
View File

@@ -209,10 +209,6 @@
# #
# DEPRECATED # DEPRECATED
# #
# [*enable_setting_ipmi_credentials*]
# (optional) Enable setting of IPMI credentials
# Defaults to $::os::service_default
#
# [*dnsmasq_ip_range*] # [*dnsmasq_ip_range*]
# (optional) IP range to use for nodes being introspected # (optional) IP range to use for nodes being introspected
# Defaults to undef # Defaults to undef
@@ -263,7 +259,6 @@ class ironic::inspector (
$discovery_default_driver = $::os_service_default, $discovery_default_driver = $::os_service_default,
# DEPRECATED # DEPRECATED
$dnsmasq_ip_range = undef, $dnsmasq_ip_range = undef,
$enable_setting_ipmi_credentials = $::os_service_default,
) { ) {
include ::ironic::deps include ::ironic::deps
@@ -276,10 +271,6 @@ class ironic::inspector (
include ::ironic::inspector::authtoken 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) { if !is_array($dnsmasq_ip_subnets) {
fail('Invalid data type, parameter dnsmasq_ip_subnets must be Array type') 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; 'capabilities/boot_mode': value => $detect_boot_mode;
'firewall/dnsmasq_interface': value => $dnsmasq_interface; 'firewall/dnsmasq_interface': value => $dnsmasq_interface;
'processing/ramdisk_logs_dir': value => $ramdisk_logs_dir; '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/add_ports': value => $add_ports;
'processing/keep_ports': value => $keep_ports; 'processing/keep_ports': value => $keep_ports;
'processing/store_data': value => $store_data; 'processing/store_data': value => $store_data;

5
releasenotes/notes/ipmi-cred-removal-f31d0ae9504b970f.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated parameter ``inspector::enable_setting_ipmi_credentials``
was removed. This feature was already removed from ironic-inspector.

1
spec/classes/ironic_inspector_spec.rb
View File

@@ -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('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('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/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/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/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('processing/store_data').with_value(p[:store_data])