From: Sébastien Han <seb@redhat.com>
Date: Thu, 13 Dec 2018 10:38:23 +0000 (+0100)
Subject: mon: remove ceph aliases for containers
X-Git-Tag: v4.0.0beta1~100
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d9e783508696319745041a6993c2b48c113011f2;p=ceph-ansible.git

mon: remove ceph aliases for containers

These aliases have led to several issues making believe that ceph
binaries are actually present on the host when running the command.
However it wasn't explicit that the commands were only ran inside a
container.
It has brought to much confusion so we decided to remove them.

Closes: https://github.com/ceph/ceph-ansible/issues/3445
Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-mon/tasks/configure_ceph_command_aliases.yml b/roles/ceph-mon/tasks/configure_ceph_command_aliases.yml
deleted file mode 100644
index dc7fc6efe..000000000
--- a/roles/ceph-mon/tasks/configure_ceph_command_aliases.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: configure ceph profile.d aliases
-  template:
-    src: ceph-aliases.sh.j2
-    dest: "/etc/profile.d/ceph-aliases.sh"
-    mode: 0755
-    owner: root
-    group: root
diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index 4704f6087..5c95026d6 100644
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -27,9 +27,4 @@
 - name: crush_rules.yml
   include_tasks: crush_rules.yml
   when:
-    - crush_rule_config
-
-- name: include configure_ceph_command_aliases.yml
-  include_tasks: configure_ceph_command_aliases.yml
-  when:
-    - containerized_deployment
\ No newline at end of file
+    - crush_rule_config
\ No newline at end of file
diff --git a/roles/ceph-mon/templates/ceph-aliases.sh.j2 b/roles/ceph-mon/templates/ceph-aliases.sh.j2
deleted file mode 100644
index 4873233af..000000000
--- a/roles/ceph-mon/templates/ceph-aliases.sh.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Sets up handy aliases for ceph.
-ceph() {
-  sudo {{ docker_exec_cmd }} ceph --cluster {{ cluster }} ${@}
-}
-
-radosgw-admin() {
-  sudo {{ docker_exec_cmd }} radosgw-admin --cluster {{ cluster }} ${@}
-}
-
-rados() {
-  sudo {{ docker_exec_cmd }} rados --cluster {{ cluster }} ${@}
-}
-
-rbd() {
-  sudo {{ docker_exec_cmd }} rbd --cluster {{ cluster }} ${@}
-}