mirror of https://github.com/ceph/ceph-ansible.git
Revert "client: add quotes to the dict values"
This commit is adding quotes that make keyring unusuable eg: ``` client.john key: AQAN0RdbAAAAABAAH5D3WgMN9Rxw3M8jkpMIfg== caps: [mds] '' caps: [mgr] 'allow *' caps: [mon] 'allow rw' caps: [osd] 'allow rw' ``` Trying to import such a keyring and use it will result: ``` Error EACCES: access denied ``` Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1623417 This reverts commitpull/3109/head v3.1.3424815501a
. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com> (cherry picked from commitecbd3e4558
)
parent
6db4fceba4
commit
92e01ae027
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
- name: set_fact keys_tmp - preserve backward compatibility after the introduction of the ceph_keys module
|
||||
set_fact:
|
||||
keys_tmp: "{{ keys_tmp|default([]) + [ { 'key': item.key, 'name': item.name, 'caps': { 'mon': item.mon_cap|quote, 'osd': item.osd_cap|default('')|quote, 'mds': item.mds_cap|default('')|quote, 'mgr': item.mgr_cap|default('')|quote } , 'mode': item.mode } ] }}"
|
||||
keys_tmp: "{{ keys_tmp|default([]) + [ { 'key': item.key, 'name': item.name, 'caps': { 'mon': item.mon_cap, 'osd': item.osd_cap|default(''), 'mds': item.mds_cap|default(''), 'mgr': item.mgr_cap|default('') } , 'mode': item.mode } ] }}"
|
||||
when:
|
||||
- item.get('mon_cap', None) # it's enough to assume we are running an old-fashionned syntax simply by checking the presence of mon_cap since every key needs this cap
|
||||
with_items: "{{ keys }}"
|
||||
|
|
Loading…
Reference in New Issue