openstack/puppet-ironic
Code Issues Proposed changes

Deprecate inspector::enable_setting_ipmi_credentials

Browse Source 
This option was deprecated upstream. Also reset its default to
$::os_service_default (which is actually the same as previous value).

Change-Id: If34b438ee31cf206729f7cf5b8fe230cafad38ae
Partial-Bug: #1654318
This commit is contained in:
Dmitry Tantsur 2017-01-31 14:16:43 +01:00
parent d991f285e8
commit c8ad960a4c
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/inspector.pp
View File

@ -55,10 +55,6 @@
# (optional) Location to store logs retrieved from the ramdisk
# Defaults to '/var/log/ironic-inspector/ramdisk/'
#
# [*enable_setting_ipmi_credentials*]
# (optional) Enable setting of IPMI credentials
# Defaults to false
#
# [*keep_ports*]
# (optional) Which ports to keep after introspection
# Defaults to 'all'
@ -177,6 +173,10 @@
# enabled. Ignored unless $pxe_transfer_protocol='http'.
# Defaults to false.
#
# [*enable_setting_ipmi_credentials*]
# (optional) Enable setting of IPMI credentials
# Defaults to $::os::service_default
#
class ironic::inspector (
$package_ensure = 'present',
$enabled = true,
@ -187,7 +187,6 @@ class ironic::inspector (
$dnsmasq_interface = 'br-ctlplane',
$db_connection = undef,
$ramdisk_logs_dir = '/var/log/ironic-inspector/ramdisk/',
$enable_setting_ipmi_credentials = false,
$keep_ports = 'all',
$store_data = 'none',
$ironic_auth_type = 'password',
@ -217,6 +216,7 @@ class ironic::inspector (
$discovery_default_driver = $::os_service_default,
# DEPRECATED
$enable_uefi = undef,
$enable_setting_ipmi_credentials = $::os_service_default,
) {
include ::ironic::deps
@ -229,6 +229,10 @@ class ironic::inspector (
include ::ironic::inspector::authtoken
}
if !is_service_default($enable_setting_ipmi_credentials) {
warning('enable_setting_ipmi_credentials is deprecated')
}
if $enable_uefi == undef {
warning('UEFI will be enabled by default starting with Pike')
} else {

4
releasenotes/notes/ipmi-cred-42c1bb301132f016.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- The "enable_setting_ipmi_credentials" ironic-inspector option was
deprecated.

3
spec/classes/ironic_inspector_spec.rb
View File

@ -33,7 +33,6 @@ describe 'ironic::inspector' do
:auth_strategy => 'keystone',
:dnsmasq_interface => 'br-ctlplane',
:ramdisk_logs_dir => '/var/log/ironic-inspector/ramdisk/',
:enable_setting_ipmi_credentials => false,
:keep_ports => 'all',
:store_data => 'none',
:ironic_auth_type => 'password',
@ -96,7 +95,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/enable_setting_ipmi_credentials').with_value(p[:enable_setting_ipmi_credentials])
is_expected.to contain_ironic_inspector_config('processing/enable_setting_ipmi_credentials').with_value('<SERVICE DEFAULT>')
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])