summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShivanand Tendulker <stendulker@gmail.com>2016-02-14 21:30:35 -0800
committerJim Rollenhagen <jim@jimrollenhagen.com>2016-03-04 00:25:10 +0000
commite0578311f63458e332750934926859dd6a03502d (patch)
tree045e713f922f087ae9645bf9d4c27188e0a910a3
parentb50435cf85d081065221f04ad916b61bd720189c (diff)
downloadironic-e0578311f63458e332750934926859dd6a03502d.tar.gz
Disable clean step 'reset_ilo' for iLO drivers by default
Disable default execution of clean step 'reset_ilo' during automated cleaning. Resetting of iLO is not required during every invocation of automated cleaning. (cherry picked from commit 380d6bfc52a793759f25955e4ac155893f427cb4) Change-Id: I45a5542c8db339417916c64455eba0fae9c3f44a Closes-Bug: 1542977
-rw-r--r--etc/ironic/ironic.conf.sample2
-rw-r--r--ironic/drivers/modules/ilo/management.py2
-rw-r--r--releasenotes/notes/disable-clean-step-reset-ilo-1869a6e08f39901c.yaml6
3 files changed, 8 insertions, 2 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 932888570..db88cece7 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -1035,7 +1035,7 @@
#
# Priority for reset_ilo clean step. (integer value)
-#clean_priority_reset_ilo=1
+#clean_priority_reset_ilo=0
# Priority for reset_bios_to_default clean step. (integer
# value)
diff --git a/ironic/drivers/modules/ilo/management.py b/ironic/drivers/modules/ilo/management.py
index 21db13864..9fdbc58a4 100644
--- a/ironic/drivers/modules/ilo/management.py
+++ b/ironic/drivers/modules/ilo/management.py
@@ -46,7 +46,7 @@ MANAGEMENT_PROPERTIES.update(ilo_common.CLEAN_PROPERTIES)
clean_step_opts = [
cfg.IntOpt('clean_priority_reset_ilo',
- default=1,
+ default=0,
help=_('Priority for reset_ilo clean step.')),
cfg.IntOpt('clean_priority_reset_bios_to_default',
default=10,
diff --git a/releasenotes/notes/disable-clean-step-reset-ilo-1869a6e08f39901c.yaml b/releasenotes/notes/disable-clean-step-reset-ilo-1869a6e08f39901c.yaml
new file mode 100644
index 000000000..30c8f06de
--- /dev/null
+++ b/releasenotes/notes/disable-clean-step-reset-ilo-1869a6e08f39901c.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - Disables default execution of clean step 'reset_ilo'
+ during automated cleaning. Resetting of iLO is not
+ required during every invocation of automated
+ cleaning. If required, operator can enable the same.