From 31af7a6db97af593fef3ac2288280d26460637f1 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 26 Oct 2020 21:02:59 +0900
Subject: [PATCH] Support more parameters for ipmi driver

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
---
 manifests/drivers/ipmi.pp                     | 19 +++++++++++++++++++
 .../ipmi-driver-opts-bd8ad63776e251c2.yaml    |  9 +++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 releasenotes/notes/ipmi-driver-opts-bd8ad63776e251c2.yaml

diff --git a/manifests/drivers/ipmi.pp b/manifests/drivers/ipmi.pp
index a73c3056..08656256 100644
--- a/manifests/drivers/ipmi.pp
+++ b/manifests/drivers/ipmi.pp
@@ -29,6 +29,19 @@
 #   Should be an interger value
 #   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*]
 #   (optional) Enables debug outputs of IPMI commands
 #   Defaults to $::os_service_default
@@ -36,6 +49,9 @@
 class ironic::drivers::ipmi (
   $command_retry_timeout = $::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,
 ) {
 
@@ -45,6 +61,9 @@ class ironic::drivers::ipmi (
   ironic_config {
     'ipmi/command_retry_timeout': value => $command_retry_timeout;
     '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;
   }
 
diff --git a/releasenotes/notes/ipmi-driver-opts-bd8ad63776e251c2.yaml b/releasenotes/notes/ipmi-driver-opts-bd8ad63776e251c2.yaml
new file mode 100644
index 00000000..83ae35a6
--- /dev/null
+++ b/releasenotes/notes/ipmi-driver-opts-bd8ad63776e251c2.yaml
@@ -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``