From: Kefu Chai Date: Thu, 23 May 2024 23:21:51 +0000 (+0800) Subject: cephadm: use importlib.metadata for querying ceph_iscsi's version X-Git-Tag: v20.0.0~1765^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F57685%2Fhead;p=ceph.git cephadm: use importlib.metadata for querying ceph_iscsi's version 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 --- diff --git a/src/cephadm/cephadmlib/daemons/iscsi.py b/src/cephadm/cephadmlib/daemons/iscsi.py index da03fe36c03f..c4b60f4a7717 100644 --- a/src/cephadm/cephadmlib/daemons/iscsi.py +++ b/src/cephadm/cephadmlib/daemons/iscsi.py @@ -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