From 6c55dc0e019614a44ba04b246c2e062a738ff3b6 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 14 Apr 2020 15:42:44 -0600 Subject: [PATCH] cephadm: use CephContainer during command `enter` instead of the `get_container` helper func Signed-off-by: Michael Fritch (cherry picked from commit 3c762d0ed92d38a2c47bf273bf17600f101ed1bb) --- src/cephadm/cephadm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 73f930593f77b..05b6fd0ba61d4 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -2779,8 +2779,12 @@ def command_enter(): '-e', 'LANG=C', '-e', "PS1=%s" % CUSTOM_PS1, ] - c = get_container(args.fsid, daemon_type, daemon_id, - container_args=container_args) + c = CephContainer( + image=args.image, + entrypoint='doesnotmatter', + container_args=container_args, + cname='ceph-%s-%s.%s' % (args.fsid, daemon_type, daemon_id), + ) command = c.exec_cmd(command) return call_timeout(command, args.timeout) -- 2.39.5