diff options
| author | Dmitry Tantsur <divius.inside@gmail.com> | 2019-04-01 16:49:21 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <divius.inside@gmail.com> | 2019-04-17 15:41:52 +0000 |
| commit | 46ce095a9ca2be10585aeed3b6790f239b8f5dff (patch) | |
| tree | ba2f069b0c5e4684e2b4bb47ee080a245c08c8e2 /ironic/conf | |
| parent | 99324667eb034de29cbf742d73a61a6318580284 (diff) | |
| download | ironic-46ce095a9ca2be10585aeed3b6790f239b8f5dff.tar.gz | |
Do not try to create temporary URLs with zero lifetime
A new option is introduced for that, which defaults to the deploy timeout
if it is set and to 1800 seconds if it is not.
Change-Id: I10e02919e40d25bd4411f2b6f98f9317d1cfb187
Story: #1653112
Task: #9707
(cherry picked from commit 2039138cfe2854b477f06d9185eddbdb264b649f)
Diffstat (limited to 'ironic/conf')
| -rw-r--r-- | ironic/conf/conductor.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ironic/conf/conductor.py b/ironic/conf/conductor.py index ae7ed983c..d5053dc01 100644 --- a/ironic/conf/conductor.py +++ b/ironic/conf/conductor.py @@ -139,6 +139,13 @@ opts = [ help=_('Name of the Swift container to store config drive ' 'data. Used when configdrive_use_object_store is ' 'True.')), + cfg.IntOpt('configdrive_swift_temp_url_duration', + min=60, + help=_('The timeout (in seconds) after which a configdrive ' + 'temporary URL becomes invalid. Defaults to ' + 'deploy_callback_timeout if it is set, otherwise to ' + '1800 seconds. Used when ' + 'configdrive_use_object_store is True.')), cfg.IntOpt('inspect_wait_timeout', default=1800, help=_('Timeout (seconds) for waiting for node inspection. ' |