From: Sage Weil <sage@newdream.net>
Date: Mon, 5 Apr 2021 14:48:07 +0000 (-0500)
Subject: cephadm: pass '-i' to docker|podman run for shell|enter
X-Git-Tag: v17.1.0~2347^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40597%2Fhead;p=ceph.git

cephadm: pass '-i' to docker|podman run for shell|enter

This allows us to pipe things to stdin.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index f4f78b13bd2e..9f957bd3f157 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4307,7 +4307,7 @@ def command_shell(ctx):
     if not ctx.keyring and os.path.exists(SHELL_DEFAULT_KEYRING):
         ctx.keyring = SHELL_DEFAULT_KEYRING
 
-    container_args = []  # type: List[str]
+    container_args: List[str] = ['-i']
     mounts = get_container_mounts(ctx, ctx.fsid, daemon_type, daemon_id,
                                   no_config=True if ctx.config else False)
     binds = get_container_binds(ctx, ctx.fsid, daemon_type, daemon_id)
@@ -4330,7 +4330,7 @@ def command_shell(ctx):
     else:
         command = ['bash']
         container_args += [
-            '-it',
+            '-t',
             '-e', 'LANG=C',
             '-e', 'PS1=%s' % CUSTOM_PS1,
         ]
@@ -4369,13 +4369,13 @@ def command_enter(ctx):
     if not ctx.fsid:
         raise Error('must pass --fsid to specify cluster')
     (daemon_type, daemon_id) = ctx.name.split('.', 1)
-    container_args = []  # type: List[str]
+    container_args = ['-i']  # type: List[str]
     if ctx.command:
         command = ctx.command
     else:
         command = ['sh']
         container_args += [
-            '-it',
+            '-t',
             '-e', 'LANG=C',
             '-e', 'PS1=%s' % CUSTOM_PS1,
         ]