From: Dimitri Savineau <dsavinea@redhat.com>
Date: Wed, 15 Jul 2020 19:14:23 +0000 (-0400)
Subject: Revert "cephadm-adopt: remove the cephadm script"
X-Git-Tag: v5.0.1~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bc2aebaa26ed1145fd211cb73f857a28262d5658;p=ceph-ansible.git

Revert "cephadm-adopt: remove the cephadm script"

This reverts commit c3bbc6b13cee5e566b277f3146e9e6bc4cec2f52.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit ceac81cd24095066898a5c061b22deffe29ca05b)
---

diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index f5a2ed94d..e2f75cc5b 100644
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -1049,22 +1049,3 @@
       changed_when: false
       environment:
         CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'
-
-- name: remove the cephadm script
-  hosts:
-    - "{{ mon_group_name|default('mons') }}"
-    - "{{ osd_group_name|default('osds') }}"
-    - "{{ mds_group_name|default('mdss') }}"
-    - "{{ rgw_group_name|default('rgws') }}"
-    - "{{ mgr_group_name|default('mgrs') }}"
-    - "{{ rbdmirror_group_name|default('rbdmirrors') }}"
-    - "{{ nfs_group_name|default('nfss') }}"
-    - "{{ iscsi_gw_group_name|default('iscsigws') }}"
-    - "{{ grafana_server_group_name|default('grafana-server') }}"
-  become: true
-  gather_facts: false
-  tasks:
-    - name: remove the cephadm script
-      file:
-        path: /usr/sbin/cephadm
-        state: absent