openstack/puppet-ironic
Code Issues Proposed changes

Support more parameters for ipmi driver

Browse Source 
This patch adds several parameters to the ironic::driver::ipmi class,
so that puppet-ironic supports more parameters for ipmi driver.

Note that additional_retryable_ipmi_errors is not added by this patch
since we need to replace ini provider by ruby provider to support
MultiStrOpt.

Change-Id: Ia166084ac8d0927db9461e43099275ba1d4c20ed
This commit is contained in:
Takashi Kajinami
2020-10-26 21:02:59 +09:00
parent 02d0fea829
commit 31af7a6db9
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/drivers/ipmi.pp
View File

@@ -29,6 +29,19 @@
# Should be an interger value # Should be an interger value
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*use_ipmitool_retries*]
# (optional) Whether the retry feature in ipmitool is used.
# Defaults to $::os_service_default
#
# [*kill_on_timeout*]
# (optional) Kill ipmitool process when the timeout expires.
# Defaults to $::os_service_default
#
# [*disable_boot_timeout*]
# (optional) Whether ironic sends a raw IPMI command to dsiable the 60 second
# timeout for booting.
# Defaults to $::os_service_default
#
# [*debug*] # [*debug*]
# (optional) Enables debug outputs of IPMI commands # (optional) Enables debug outputs of IPMI commands
# Defaults to $::os_service_default # Defaults to $::os_service_default
@@ -36,6 +49,9 @@
class ironic::drivers::ipmi ( class ironic::drivers::ipmi (
$command_retry_timeout = $::os_service_default, $command_retry_timeout = $::os_service_default,
$min_command_interval = $::os_service_default, $min_command_interval = $::os_service_default,
$use_ipmitool_retries = $::os_service_default,
$kill_on_timeout = $::os_service_default,
$disable_boot_timeout = $::os_service_default,
$debug = $::os_service_default, $debug = $::os_service_default,
) { ) {
@@ -45,6 +61,9 @@ class ironic::drivers::ipmi (
ironic_config { ironic_config {
'ipmi/command_retry_timeout': value => $command_retry_timeout; 'ipmi/command_retry_timeout': value => $command_retry_timeout;
'ipmi/min_command_interval': value => $min_command_interval; 'ipmi/min_command_interval': value => $min_command_interval;
'ipmi/use_ipmitool_retries': value => $use_ipmitool_retries;
'ipmi/kill_on_timeout': value => $kill_on_timeout;
'ipmi/disable_boot_timeout': value => $disable_boot_timeout;
'ipmi/debug': value => $debug; 'ipmi/debug': value => $debug;
} }

9
releasenotes/notes/ipmi-driver-opts-bd8ad63776e251c2.yaml Normal file
View File

@@ -0,0 +1,9 @@
---
features:
- |
The following parameters have been added to the ``ironic::driver::ipmi``
class.
- ``use_ipmitool_retries``
- ``kill_on_timeout``
- ``disable_boot_timeout``