common: follow up on #5948

In addition to f7e2b2c Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
ceph · Nov 3, 2020 · 371d854 · 371d854
1 parent 0d76826
commit 371d854
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 }}"