From: Michael Fritch <mfritch@suse.com>
Date: Tue, 14 Apr 2020 21:42:44 +0000 (-0600)
Subject: cephadm: use CephContainer during command `enter`
X-Git-Tag: v16.1.0~2596^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34558%2Fhead;p=ceph.git

cephadm: use CephContainer during command `enter`

instead of the `get_container` helper func

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 2c34d6e5f2c6..7818bc44e5b2 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)