From 161170524d282d2bfb2fff44886a6451f8b74ecd Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 10 Oct 2019 21:25:10 +0200 Subject: [PATCH] mgr: improve mgr keyring creation Delegating on remote node isn't necessary here since we are already iterating over the right nodes. Closes: #4518 Signed-off-by: Guillaume Abrioux --- roles/ceph-mgr/tasks/common.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/ceph-mgr/tasks/common.yml b/roles/ceph-mgr/tasks/common.yml index 352a76c44..1218f4f6c 100644 --- a/roles/ceph-mgr/tasks/common.yml +++ b/roles/ceph-mgr/tasks/common.yml @@ -51,7 +51,7 @@ - name: set_fact _mgr_keys set_fact: - _mgr_keys: "{{ _mgr_keys | default([{ 'name': 'client.admin', 'path': '/etc/ceph/' + cluster + '.client.admin.keyring', 'copy_key': copy_admin_key, 'hostname': hostvars[item]['ansible_hostname'] }]) + [{ 'name': 'mgr.' + hostvars[item]['ansible_hostname'], 'path': '/var/lib/ceph/mgr/' + cluster + '-' + hostvars[item]['ansible_hostname'] + '/keyring', 'copy_key': true, 'hostname': hostvars[item]['ansible_hostname'] }] }}" + _mgr_keys: "{{ _mgr_keys | default([{ 'name': 'client.admin', 'path': '/etc/ceph/' + cluster + '.client.admin.keyring', 'copy_key': copy_admin_key }]) + [{ 'name': 'mgr.' + hostvars[item]['ansible_hostname'], 'path': '/var/lib/ceph/mgr/' + cluster + '-' + hostvars[item]['ansible_hostname'] + '/keyring', 'copy_key': true }] }}" with_items: "{{ groups.get(mgr_group_name, []) }}" - name: get keys from monitors @@ -72,8 +72,6 @@ group: "{{ ceph_uid if containerized_deployment else 'ceph' }}" mode: "{{ ceph_keyring_permissions }}" with_items: "{{ _mgr_keys.results }}" - delegate_to: "{{ item.item.hostname }}" - run_once: true when: - cephx | bool - item.item.copy_key | bool -- 2.39.5