From: Gaudenz Steinlin <gaudenz.steinlin@cloudscale.ch>
Date: Mon, 10 Aug 2020 09:38:47 +0000 (+0200)
Subject: ceph-crash: Only deploy key to targeted hosts
X-Git-Tag: v5.0.3~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8a64ce4526c9a79f130aed6080a6d4271ba3e65;p=ceph-ansible.git

ceph-crash: Only deploy key to targeted hosts

The current task installs the ceph-crash key to "most" hosts via
"delegate_to". This key is only used by the ceph-crash daemon and should
just be installed on all hosts targeted by this role. There is no need
for using a delegated task.

Signed-off-by: Gaudenz Steinlin <gaudenz.steinlin@cloudscale.ch>
(cherry picked from commit 68cc93fb18d516a04e288418811787355fb0582e)
---

diff --git a/roles/ceph-crash/tasks/main.yml b/roles/ceph-crash/tasks/main.yml
index 01b85fd01..4f814dbf8 100644
--- a/roles/ceph-crash/tasks/main.yml
+++ b/roles/ceph-crash/tasks/main.yml
@@ -22,20 +22,10 @@
       command: "{{ hostvars[groups[mon_group_name][0]]['container_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} auth get client.crash"
       register: _crash_keys
       delegate_to: "{{ groups.get(mon_group_name)[0] }}"
+      check_mode: False
+      changed_when: False
       run_once: true
 
-    - name: get a list of node where the keyring should be copied
-      set_fact:
-        list_target_node: "{{ list_target_node | default([]) | union(((groups.get('all') | difference(groups.get(grafana_server_group_name, []) + groups.get(client_group_name, []) + groups.get(nfs_group_name, []) + groups.get(iscsi_gw_group_name, []))) + groups.get(item, [])) | unique) }}"
-      run_once: True
-      with_items:
-        - "{{ mon_group_name if groups.get(mon_group_name, []) | length > 0 else [] }}"
-        - "{{ osd_group_name if groups.get(osd_group_name, []) | length > 0 else [] }}"
-        - "{{ mds_group_name if groups.get(mds_group_name, []) | length > 0 else [] }}"
-        - "{{ rgw_group_name if groups.get(rgw_group_name, []) | length > 0 else [] }}"
-        - "{{ rbdmirror_group_name if groups.get(rbdmirror_group_name, []) | length > 0 else [] }}"
-        - "{{ mgr_group_name if groups.get(mgr_group_name, []) | length > 0 else [] }}"
-
     - name: copy ceph key(s) if needed
       copy:
         dest: "{{ ceph_conf_key_directory }}/{{ cluster }}.client.crash.keyring"
@@ -43,10 +33,6 @@
         owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
         group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
         mode: "{{ ceph_keyring_permissions }}"
-      with_items: "{{ list_target_node }}"
-      delegate_to: "{{ item }}"
-      run_once: True
-      when: _crash_keys is not skipped
 
 - name: start ceph-crash daemon
   when: containerized_deployment | bool