From: Gaudenz Steinlin <gaudenz.steinlin@cloudscale.ch>
Date: Mon, 10 Aug 2020 09:52:56 +0000 (+0200)
Subject: openstack: use ceph_keyring_permissions by default
X-Git-Tag: v5.0.3~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2550e44e2f36f5a9107ca32314d215d8433aef86;p=ceph-ansible.git

openstack: use ceph_keyring_permissions by default

Otherwise this task fails if no permission is set on the item.
Previously the code omited the mode parameter if it was not set, but
this was lost with commit ab370b6ad823e551cfc324fd9c264633a34b72b5.

Signed-off-by: Gaudenz Steinlin <gaudenz.steinlin@cloudscale.ch>
(cherry picked from commit 79ff79c422e88e5ec848bec880ef01a87ceeb298)
---

diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml
index 99a8981bc..386bc6b17 100644
--- a/roles/ceph-osd/tasks/openstack_config.yml
+++ b/roles/ceph-osd/tasks/openstack_config.yml
@@ -47,9 +47,9 @@
       copy:
         dest: "/etc/ceph/{{ cluster }}.{{ item.0.item.name }}.keyring"
         content: "{{ item.0.stdout + '\n' }}"
-        owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
-        group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
-        mode: "{{ item.0.item.mode }}"
+        owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
+        group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
+        mode: "{{ item.0.item.mode | default(ceph_keyring_permissions) }}"
       with_nested:
         - "{{ _osp_keys.results }}"
         - "{{ groups[mon_group_name] }}"