From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Mon, 2 Nov 2020 14:56:28 +0000 (+0100)
Subject: common: follow up on #5948
X-Git-Tag: v6.0.0alpha3~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=371d854a5c03cfb30d27d5cdbaaad61f7f8d6c58;p=ceph-ansible.git

common: follow up on #5948

In addition to f7e2b2c608eef4bbba47586f1e24d6ade1572758

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml
index 471dd916d..e6c53a01e 100644
--- a/roles/ceph-client/tasks/create_users_keys.yml
+++ b/roles/ceph-client/tasks/create_users_keys.yml
@@ -27,7 +27,7 @@
     cluster: "{{ cluster }}"
     dest: "{{ ceph_conf_key_directory }}"
     import_key: "{{ admin_key_presence }}"
-    mode: "{{ item.mode|default(omit) }}"
+    mode: "{{ item.mode | default(ceph_keyring_permissions) }}"
     owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
     group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
   environment:
diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml
index ba702ad74..83139ad16 100644
--- a/roles/ceph-osd/tasks/openstack_config.yml
+++ b/roles/ceph-osd/tasks/openstack_config.yml
@@ -29,7 +29,7 @@
         caps: "{{ item.caps }}"
         secret: "{{ item.key | default('') }}"
         cluster: "{{ cluster }}"
-        mode: "{{ item.mode|default(omit) }}"
+        mode: "{{ item.mode | default(ceph_keyring_permissions) }}"
       environment:
         CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment | bool else None }}"
         CEPH_CONTAINER_BINARY: "{{ container_binary }}"