ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 ab370b6ad8.

Signed-off-by: Gaudenz Steinlin <gaudenz.steinlin@cloudscale.ch>
(cherry picked from commit 79ff79c422)
pull/5995/head
Gaudenz Steinlin 2020-08-10 11:52:56 +02:00 committed by Dimitri Savineau
parent f344fe6f92
commit a1ff05b26e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ceph-osd/tasks/openstack_config.yml
View File

@ -115,9 +115,9 @@
copy: copy:
dest: "/etc/ceph/{{ cluster }}.{{ item.0.item.name }}.keyring" dest: "/etc/ceph/{{ cluster }}.{{ item.0.item.name }}.keyring"
content: "{{ item.0.stdout + '\n' }}" content: "{{ item.0.stdout + '\n' }}"
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}" owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
group: "{{ ceph_uid if containerized_deployment 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: with_nested:
- "{{ _osp_keys.results }}" - "{{ _osp_keys.results }}"
- "{{ groups[mon_group_name] }}" - "{{ groups[mon_group_name] }}"