summaryrefslogtreecommitdiff
path: root/ironic/conf/conductor.py
diff options
context:
space:
mode:
authorJay Faulkner <jay@jvf.cc>2016-08-09 16:09:02 -0700
committerShivanand Tendulker <stendulker@gmail.com>2018-01-22 11:38:36 -0500
commita9bc2e6ddf81d7bb22ddeb32f57d2c7bf368d6bd (patch)
tree4a5112bb11de959a76206b3a45e767b246cd9ef8 /ironic/conf/conductor.py
parentfbee0981ad0afe304e58006609eabf35cfe89489 (diff)
downloadironic-a9bc2e6ddf81d7bb22ddeb32f57d2c7bf368d6bd.tar.gz
Add rescuewait timeout periodic task
Ensure nodes don't get stuck in rescuewait forever when a rescue ramdisk fails to boot and start heartbeating. Change-Id: I15a92c0f619505e25768dc2fbc1b2a796f0b38fa Related-bug: #1526449 Co-Authored-By: Jay Faulkner <jay@jvf.cc> Co-Authored-By: Mario Villaplana <mario.villaplana@gmail.com> Co-Authored-By: Jesse J. Cook <jesse.j.cook@member.fsf.org> Co-Authored-By: Aparna <aparnavtce@gmail.com> Co-Authored-By: Shivanand Tendulker <stendulker@gmail.com>
Diffstat (limited to 'ironic/conf/conductor.py')
-rw-r--r--ironic/conf/conductor.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/ironic/conf/conductor.py b/ironic/conf/conductor.py
index 5cdbf7286..ae0134731 100644
--- a/ironic/conf/conductor.py
+++ b/ironic/conf/conductor.py
@@ -52,6 +52,12 @@ opts = [
default=60,
help=_('Interval between checks of provision timeouts, '
'in seconds.')),
+ cfg.IntOpt('check_rescue_state_interval',
+ default=60,
+ min=1,
+ help=_('Interval (seconds) between checks of rescue '
+ 'timeouts. This option is part of rescue feature '
+ 'work, which is not currently exposed to users.')),
cfg.IntOpt('deploy_callback_timeout',
default=1800,
help=_('Timeout (seconds) to wait for a callback from '
@@ -145,6 +151,15 @@ opts = [
'ramdisk doing the cleaning. If the timeout is reached '
'the node will be put in the "clean failed" provision '
'state. Set to 0 to disable timeout.')),
+ cfg.IntOpt('rescue_callback_timeout',
+ default=1800,
+ min=0,
+ help=_('Timeout (seconds) to wait for a callback from the '
+ 'rescue ramdisk. If the timeout is reached the node '
+ 'will be put in the "rescue failed" provision state. '
+ 'Set to 0 to disable timeout. This option is part of '
+ 'rescue feature work, which is not currently exposed '
+ 'to users.')),
cfg.IntOpt('soft_power_off_timeout',
default=600,
min=1,