From 65ca43407b776290df294a5aba1226d07285de3d Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 21 Sep 2022 12:29:26 +0100 Subject: [PATCH] Cephadm: Fix keyring generation Previously only the key was included, but we need the full file including caps. --- etc/kayobe/ansible/cephadm-gather-keys.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/ansible/cephadm-gather-keys.yml b/etc/kayobe/ansible/cephadm-gather-keys.yml index 4f0330deb..bfaeaaf32 100644 --- a/etc/kayobe/ansible/cephadm-gather-keys.yml +++ b/etc/kayobe/ansible/cephadm-gather-keys.yml @@ -25,6 +25,7 @@ - name: Get Ceph keys stackhpc.cephadm.cephadm_key: name: "{{ item }}" + output_format: plain state: info register: cephadm_key_info become: true @@ -49,10 +50,12 @@ - name: Save Ceph keys to Kayobe configuration vars: key_info: "{{ cephadm_key_info.results | selectattr('item', 'equalto', item.1) | first }}" - cephadm_key: "{{ (key_info.stdout | from_json | first)['key'] }}" - cephadm_user: "{{ (key_info.stdout | from_json | first)['entity'] }}" + cephadm_key: "{{ key_info.stdout }}" + cephadm_user: "{{ item.1 }}" copy: - content: "{{ cephadm_key }}" + # Include a trailing newline. + content: | + {{ cephadm_key }} dest: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_key_dir[item.0.name] }}/ceph.{{ cephadm_user }}.keyring" loop: "{{ query('subelements', kolla_ceph_services | selectattr('required'), 'keys') }}" loop_control: