From a1ff05b26ea63e5c9f8bbeb5339cff806465954e Mon Sep 17 00:00:00 2001 From: Gaudenz Steinlin Date: Mon, 10 Aug 2020 11:52:56 +0200 Subject: [PATCH] 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 (cherry picked from commit 79ff79c422e88e5ec848bec880ef01a87ceeb298) --- roles/ceph-osd/tasks/openstack_config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml index 827963251..b0bf8a758 100644 --- a/roles/ceph-osd/tasks/openstack_config.yml +++ b/roles/ceph-osd/tasks/openstack_config.yml @@ -115,9 +115,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] }}"