pybind/mgr: Correct code to ensure cephadm/tests/test_certmgr.py passes.

Signed-off-by: Paulo E. Castro <pecastro@wormholenet.com>
(cherry picked from commit 218d84fc15d818d2df56c92cd71aeb2aa85f1590)

Resolves: rhbz#2401206

diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py
index 6298612105ae71cdc17f764a3a71ed5317d6f81a..802b040051d0eb522499e4b86857d6d52fef3844 100644 (file)
--- a/src/pybind/mgr/mgr_util.py
+++ b/src/pybind/mgr/mgr_util.py
@@ -683,8 +683,8 @@ def get_cert_issuer_info(crt: str) -> Tuple[Optional[str], Optional[str]]:
 def verify_tls(crt, key):
     # type: (str, str) -> int
     cc = ceph.cryptotools.remote.CryptoCaller()
-    days_to_expiration = cc.verify_cacrt_content(crt)
     try:
+        days_to_expiration = cc.verify_cacrt_content(crt)
         cc.verify_tls(crt, key)
     except ValueError as err:
         raise ServerConfigException(str(err))

diff --git a/src/python-common/ceph/cryptotools/remote.py b/src/python-common/ceph/cryptotools/remote.py
index a83399828e1ff2a4e142388cb6c858a357bf6015..9a668ca4bfa26e36a3b3ebe50d2beb6f728b0a65 100644 (file)
--- a/src/python-common/ceph/cryptotools/remote.py
+++ b/src/python-common/ceph/cryptotools/remote.py
@@ -124,6 +124,7 @@ class CryptoCaller:
         self._run(
             ['verify_tls'],
             input_data=json.dumps({'crt': crt, 'key': key}),
+            capture_output=True,
             check=True,
         )