From: Kiefer Chang <kiefer.chang@suse.com>
Date: Wed, 18 Dec 2019 06:38:04 +0000 (+0800)
Subject: mgr/cephadm: fix type of timeout options
X-Git-Tag: v15.1.0~378^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84daea2cb36c426f6777bbe31615bdef3c3e3cea;p=ceph.git

mgr/cephadm: fix type of timeout options

The timeout options need to be in `secs` type. Then the input values
will be checked and converted into integer before use.

Fixes: https://tracker.ceph.com/issues/43363
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 08ca56d461eb..0a66bad13325 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -268,13 +268,13 @@ class CephadmOrchestrator(MgrModule, orchestrator.Orchestrator):
         },
         {
             'name': 'inventory_cache_timeout',
-            'type': 'seconds',
+            'type': 'secs',
             'default': 10 * 60,
             'desc': 'seconds to cache device inventory',
         },
         {
             'name': 'service_cache_timeout',
-            'type': 'seconds',
+            'type': 'secs',
             'default': 60,
             'desc': 'seconds to cache service (daemon) inventory',
         },