From 749d404e87994f406463891051c2730765dc901a Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 25 Sep 2019 16:02:08 +0200
Subject: [PATCH] mon: use ceph_key module for containerized mgr keyring
 creation

This commit replaces a `command` task with `ceph_key` in order to create
mgr keyrings.

This allows us to use `mode` parameter to set the right mode on
generated keys.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1734513

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---
 roles/ceph-mon/tasks/docker/main.yml | 46 ++++++++++++++++------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 032d49bf9..c240116ed 100644
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -94,27 +94,33 @@
     - not containerized_deployment_with_kv
 
 - block:
-  - name: create ceph mgr keyring(s) when mon is containerized
-    command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} auth get-or-create mgr.{{ hostvars[item]['ansible_hostname'] }} mon 'allow profile mgr' osd 'allow *' mds 'allow *' -o /etc/ceph/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring"
-    args:
-      creates: "{{ ceph_conf_key_directory }}/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring"
-    changed_when: false
-    when:
-      - cephx
-      - containerized_deployment
-      - "{{ groups.get(mgr_group_name, []) | length > 0 }}"
-      - not containerized_deployment_with_kv
-    with_items: "{{ groups.get(mgr_group_name, []) }}"
+    - name: create ceph mgr keyring(s) when mon is containerized
+      ceph_key:
+        state: present
+        name: "mgr.{{ hostvars[item]['ansible_hostname'] }}"
+        caps:
+          mon: 'allow profile mgr'
+          osd: 'allow *'
+          mds: 'allow *'
+        containerized: "{{ docker_exec_cmd }}"
+        cluster: "{{ cluster }}"
+        mode: "{{ ceph_keyring_permissions }}"
+      with_items: "{{ groups.get(mgr_group_name) }}"
+      when:
+        - cephx
+        - containerized_deployment
+        - "{{ groups.get(mgr_group_name, []) | length > 0 }}"
+        - not containerized_deployment_with_kv
 
-  - name: fetch ceph mgr key(s)
-    fetch:
-      src: "{{ ceph_conf_key_directory }}/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring"
-      dest: "{{ fetch_directory }}/{{ fsid }}/{{ ceph_conf_key_directory }}/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring"
-      flat: yes
-    with_items:
-      - "{{ groups.get(mgr_group_name, []) }}"
-    when:
-      - "{{ groups.get(mgr_group_name, []) | length > 0 }}"
+    - name: fetch ceph mgr key(s)
+      fetch:
+        src: "{{ ceph_conf_key_directory }}/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring"
+        dest: "{{ fetch_directory }}/{{ fsid }}/{{ ceph_conf_key_directory }}/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring"
+        flat: yes
+      with_items:
+        - "{{ groups.get(mgr_group_name, []) }}"
+      when:
+        - "{{ groups.get(mgr_group_name, []) | length > 0 }}"
 
   when:
     - not rolling_update
-- 
2.47.3