Skip to content

Commit cbd4bed

Browse files
committed
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 <[email protected]>
1 parent be1a8c2 commit cbd4bed

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/cephadm/cephadmlib/daemons/iscsi.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,11 @@ def python(s: str) -> Tuple[str, str, int]:
136136
out, _, code = python(
137137
"from importlib.metadata import version; print(version('ceph_iscsi'))"
138138
)
139+
if code == 0:
140+
return out.strip()
141+
out, _, code = python(
142+
"import pkg_resources; print(pkg_resources.require('ceph_iscsi')[0].version)"
143+
)
139144
if code == 0:
140145
return out.strip()
141146
return None

0 commit comments

Comments
 (0)