]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: use importlib.metadata for querying ceph_iscsi's version 57970/head
authorKefu Chai <tchaikov@gmail.com>
Thu, 23 May 2024 23:21:51 +0000 (07:21 +0800)
committerAdam King <adking@redhat.com>
Tue, 11 Jun 2024 16:29:54 +0000 (12:29 -0400)
use importlib.metadata for querying ceph_iscsi's version and fallback to
pkg_resources. as the former is only available in Python 3.8, while
the latter is deprecated.

Refs https://tracker.ceph.com/issues/66201
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit cbd4bede7f258823462f27cb15d86e13eb52c359)

src/cephadm/cephadmlib/daemons/iscsi.py

index da03fe36c03f3b3033af2cecf0a21555a9224aca..c4b60f4a77172dd420eb8cd82e16bc3123bb6201 100644 (file)
@@ -136,6 +136,11 @@ class CephIscsi(ContainerDaemonForm):
         out, _, code = python(
             "from importlib.metadata import version; print(version('ceph_iscsi'))"
         )
+        if code == 0:
+            return out.strip()
+        out, _, code = python(
+            "import pkg_resources; print(pkg_resources.require('ceph_iscsi')[0].version)"
+        )
         if code == 0:
             return out.strip()
         return None