diff options
| author | Kaifeng Wang <kaifeng.w@gmail.com> | 2018-03-22 17:35:00 +0800 |
|---|---|---|
| committer | Kaifeng Wang <kaifeng.w@gmail.com> | 2018-04-10 11:21:46 +0800 |
| commit | 6df82ee2bcc702168e80ec7c81e5573d766f9c71 (patch) | |
| tree | be92ca71643c21378fcbde57d35d992a75ccdc7f /ironic/conf/conductor.py | |
| parent | c03dfbf2eb4eb4242c3848c40f3faf42c142e8a9 (diff) | |
| download | ironic-6df82ee2bcc702168e80ec7c81e5573d766f9c71.tar.gz | |
Implementation of inspect wait state
This patch provides implementations to feature of adding inspect wait state.
Changes covered in this patch:
* Added state and transitions, state diagram regenerated.
* inspector and oneview inspect interface now return INSPECTWAIT instead of
INSPECTING. Move node to inspect wait if inspect interface returns
INSPECTING or INSPECTWAIT.
* Add a timeout option to conductor, and a periodic task to check timeout
in the inspect wait state.
Story: #1725211
Task: #10630
Partial-Bug: #1725211
Change-Id: Ie76bfdad5966014a4dae826919ff5705462c743b
Diffstat (limited to 'ironic/conf/conductor.py')
| -rw-r--r-- | ironic/conf/conductor.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ironic/conf/conductor.py b/ironic/conf/conductor.py index d3174bf29..1d1175c31 100644 --- a/ironic/conf/conductor.py +++ b/ironic/conf/conductor.py @@ -122,8 +122,9 @@ opts = [ help=_('Name of the Swift container to store config drive ' 'data. Used when configdrive_use_object_store is ' 'True.')), - cfg.IntOpt('inspect_timeout', + cfg.IntOpt('inspect_wait_timeout', default=1800, + deprecated_name='inspect_timeout', help=_('Timeout (seconds) for waiting for node inspection. ' '0 - unlimited.')), cfg.BoolOpt('automated_clean', |