From: Dimitri Savineau <dsavinea@redhat.com>
Date: Tue, 4 Feb 2020 16:31:47 +0000 (-0500)
Subject: ceph-mon: use interactive session with aliases
X-Git-Tag: v3.2.40~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=553fb1ed1ea91b6e7dbf6935433266010c8b1483;p=ceph-ansible.git

ceph-mon: use interactive session with aliases

When using ceph aliases with commands that require manual intervention
to stop then the command will keep running inside the container (like
using Ctrl+c).
For handling this, we should use the interactive session option (-it)
with the docker commands.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1797874

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/roles/ceph-mon/templates/ceph-aliases.sh.j2 b/roles/ceph-mon/templates/ceph-aliases.sh.j2
index 4873233af..c6dd69fde 100644
--- a/roles/ceph-mon/templates/ceph-aliases.sh.j2
+++ b/roles/ceph-mon/templates/ceph-aliases.sh.j2
@@ -1,17 +1,17 @@
 #!/bin/bash
 # Sets up handy aliases for ceph.
 ceph() {
-  sudo {{ docker_exec_cmd }} ceph --cluster {{ cluster }} ${@}
+  sudo docker exec -it ceph-mon-{{ ansible_hostname }} ceph --cluster {{ cluster }} ${@}
 }
 
 radosgw-admin() {
-  sudo {{ docker_exec_cmd }} radosgw-admin --cluster {{ cluster }} ${@}
+  sudo docker exec -it ceph-mon-{{ ansible_hostname }} radosgw-admin --cluster {{ cluster }} ${@}
 }
 
 rados() {
-  sudo {{ docker_exec_cmd }} rados --cluster {{ cluster }} ${@}
+  sudo docker exec -it ceph-mon-{{ ansible_hostname }} rados --cluster {{ cluster }} ${@}
 }
 
 rbd() {
-  sudo {{ docker_exec_cmd }} rbd --cluster {{ cluster }} ${@}
+  sudo docker exec -it ceph-mon-{{ ansible_hostname }} rbd --cluster {{ cluster }} ${@}
 }