From: Sébastien Han <seb@redhat.com>
Date: Thu, 27 Sep 2018 14:29:22 +0000 (+0200)
Subject: ceph-fetch-keys: refact
X-Git-Tag: v3.2.0beta6~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=680574ed4c86018387619cc108302759738f963b;p=ceph-ansible.git

ceph-fetch-keys: refact

This commits simplies the usage of the ceph-fetch-keys role. The role
now has a nicer way to find various ceph keys and fetch them on the
ansible server.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1624962
Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-fetch-keys/tasks/main.yml b/roles/ceph-fetch-keys/tasks/main.yml
index 61f2f3a58..5957093c0 100644
--- a/roles/ceph-fetch-keys/tasks/main.yml
+++ b/roles/ceph-fetch-keys/tasks/main.yml
@@ -1,24 +1,16 @@
 ---
-- name: find ceph keys
+- name: lookup keys in /etc/ceph
   shell: ls -1 /etc/ceph/*.keyring
   changed_when: false
   register: ceph_keys
-  check_mode: no
 
-- name: set keys permissions
-  file:
-    path: "{{ item }}"
-    mode: "{{ ceph_keyring_permissions }}"
-    owner: root
-    group: root
-  with_items:
-    - "{{ ceph_keys.stdout_lines }}"
 
-- name: copy keys to the ansible server
+- name: "copy ceph user and bootstrap keys to the ansible server in {{ fetch_directory }}/{{ fsid }}/"
   fetch:
     src: "{{ item }}"
     dest: "{{ fetch_directory }}/{{ fsid }}/{{ item }}"
     flat: yes
+    fail_on_missing: false
   run_once: true
   with_items:
     - "{{ ceph_keys.stdout_lines }}"
@@ -26,3 +18,4 @@
     - "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring"
     - "/var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring"
     - "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
+    - "/var/lib/ceph/bootstrap-mgr/{{ cluster }}.keyring"
\ No newline at end of file