]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
openstack: use ceph_keyring_permissions by default
authorGaudenz Steinlin <gaudenz.steinlin@cloudscale.ch>
Mon, 10 Aug 2020 09:52:56 +0000 (11:52 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 2 Nov 2020 14:53:58 +0000 (15:53 +0100)
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>
roles/ceph-osd/tasks/openstack_config.yml

index 8a16ca02568c55e9cb391c105f4593e815c87c41..e1ea5de5df8551772fa47a5790dd1275955c0c51 100644 (file)
@@ -49,7 +49,7 @@
         content: "{{ item.0.stdout + '\n' }}"
         owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
         group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
-        mode: "{{ item.0.item.mode }}"
+        mode: "{{ item.0.item.mode | default(ceph_keyring_permissions) }}"
       with_nested:
         - "{{ _osp_keys.results }}"
         - "{{ groups[mon_group_name] }}"