diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-04 11:40:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-04 11:40:31 +0000 |
| commit | b8dfababce7ac463514ac6c6090e723ac96f58fa (patch) | |
| tree | 72b6b46893f2e525869aab34a022d3032ef2277f | |
| parent | e9f49ad195884a973e32105f4e3f22512d967f0e (diff) | |
| parent | e0578311f63458e332750934926859dd6a03502d (diff) | |
| download | ironic-b8dfababce7ac463514ac6c6090e723ac96f58fa.tar.gz | |
Merge "Disable clean step 'reset_ilo' for iLO drivers by default" into stable/liberty
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 2 | ||||
| -rw-r--r-- | ironic/drivers/modules/ilo/management.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/disable-clean-step-reset-ilo-1869a6e08f39901c.yaml | 6 |
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. |