diff options
| author | e <yuanliu@cmss.chinamobile.com> | 2020-04-28 13:03:37 +0800 |
|---|---|---|
| committer | yuanliu <yuanliu@cmss.chinamobile.com> | 2020-05-11 01:08:07 +0000 |
| commit | f464e78efeebcb4489b673658d434162bb7c8484 (patch) | |
| tree | 7fff5d7f66f02f016081f3306645d970fa26e16f /ironic/conf | |
| parent | 4d41af5038369b31ae44e18d2cbf2e311a8bc7fa (diff) | |
| download | ironic-f464e78efeebcb4489b673658d434162bb7c8484.tar.gz | |
If the "[conductor]XXX_timeout" is less than 0，disable periodic task
"[conductor]clean_callback_timeout"，"[conductor]inspect_wait_timeout"
and "[conductor]inspect_wait_timeout" are a negative value will cause
an error on start up from now on.
Change-Id: Id3bef9a753be7f0c468ea3033698f0e9cd276a64
Story: 2007600
Task: 39576
Diffstat (limited to 'ironic/conf')
| -rw-r--r-- | ironic/conf/conductor.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ironic/conf/conductor.py b/ironic/conf/conductor.py index da98678a6..5945f471c 100644 --- a/ironic/conf/conductor.py +++ b/ironic/conf/conductor.py @@ -70,6 +70,7 @@ opts = [ 'in seconds. Set to 0 to disable checks.')), cfg.IntOpt('deploy_callback_timeout', default=1800, + min=0, help=_('Timeout (seconds) to wait for a callback from ' 'a deploy ramdisk. Set to 0 to disable timeout.')), cfg.BoolOpt('force_power_state_during_sync', @@ -158,6 +159,7 @@ opts = [ 'configdrive_use_object_store is True.')), cfg.IntOpt('inspect_wait_timeout', default=1800, + min=0, help=_('Timeout (seconds) for waiting for node inspection. ' '0 - unlimited.')), cfg.BoolOpt('automated_clean', @@ -192,6 +194,7 @@ opts = [ 'maintenance will make the process continue.')), cfg.IntOpt('clean_callback_timeout', default=1800, + min=0, help=_('Timeout (seconds) to wait for a callback from the ' 'ramdisk doing the cleaning. If the timeout is reached ' 'the node will be put in the "clean failed" provision ' |