Merge "Fix the ceph-mgr connect to cluster failed"

ansible/roles/ceph/tasks/distribute_keyrings.yml

@@ -36,6 +36,17 @@
     - "{{ ceph_files['ceph.monmap'] }}"
   when: inventory_hostname in groups['ceph-mon']
 
+- name: Pushing Ceph keyrings for Mgrs
+  become: true
+  bslurp:
+    src: "{{ item.content }}"
+    dest: "{{ node_config_directory }}/ceph-mgr/{{ item.filename }}"
+    sha1: "{{ item.sha1 }}"
+    mode: 0600
+  with_items:
+    - "{{ ceph_files['ceph.client.admin.keyring'] }}"
+  when: inventory_hostname in groups['ceph-mgr']
+
 - name: Pushing Ceph keyrings for RGWs
   become: true
   bslurp:

ansible/roles/ceph/templates/ceph-mgr.json.j2

@@ -12,6 +12,12 @@
             "dest": "/var/lib/ceph/mgr/ceph-{{ inventory_hostname }}/keyring",
             "owner": "ceph",
             "perm": "0600"
+        },
+        {
+            "source": "{{ container_config_directory }}/ceph.client.admin.keyring",
+            "dest": "/etc/ceph/ceph.client.admin.keyring",
+            "owner": "ceph",
+            "perm": "0600"
         }
     ]
 }