]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: use CephContainer during command `enter` 34558/head
authorMichael Fritch <mfritch@suse.com>
Tue, 14 Apr 2020 21:42:44 +0000 (15:42 -0600)
committerMichael Fritch <mfritch@suse.com>
Tue, 14 Apr 2020 22:25:34 +0000 (16:25 -0600)
instead of the `get_container` helper func

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

index 2c34d6e5f2c6823ed79444ca69cef0ccce86bba7..7818bc44e5b2c391f65ac6d46ef56d857d99c2d6 100755 (executable)
@@ -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)