From 92e01ae027aac5c04b091fa228741ef383127f82 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 7 Sep 2018 16:54:42 +0200 Subject: [PATCH] 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 commit 424815501a0c6072234a8e1311a0fefeb5bcc222. Signed-off-by: Guillaume Abrioux (cherry picked from commit ecbd3e45584791678e590172c5a0ceda7bd83623) --- roles/ceph-client/tasks/create_users_keys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml index 64e01d913..95ac72577 100644 --- a/roles/ceph-client/tasks/create_users_keys.yml +++ b/roles/ceph-client/tasks/create_users_keys.yml @@ -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 }}"