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 (file)
index dc7fc6e..0000000
--- 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 4704f6087ed08203b6373c6a007b800c40ad4027..5c95026d62b6ab100b07ed63f5741a5710934d97 100644 (file)
--- 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 (file)
index 4873233..0000000
--- 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 }} ${@}
-}