Skip to content

Commit 9f38347

Browse files
committed
cephadm: make container id lookup compatible with 8.1z1 codebase
Signed-off-by: Adam King <[email protected]> Resolves: rhbz#2373703
1 parent 3e958a6 commit 9f38347

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/cephadm/cephadm.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -761,12 +761,7 @@ def get_legacy_daemon_fsid(ctx, cluster,
761761
return fsid
762762

763763
def lookup_container_id_by_daemon_name(ctx: CephadmContext, fsid: str, name: str) -> str:
764-
updater = CombinedStatusUpdater([CoreStatusUpdater()])
765-
daemon_entries = daemons_matching(
766-
ctx,
767-
daemon_name=name,
768-
)
769-
daemons = [updater.expand(ctx, entry) for entry in daemon_entries]
764+
daemons = list_daemons(ctx, daemon_name=name)
770765
if not daemons:
771766
raise Error(f'Failed to find daemon {name}')
772767
if len(daemons) > 1:

0 commit comments

Comments
 (0)