[stable/2024.2] fix(ceph_csi_rbd): fix external Ceph keyring variable evaluation (#3330)

Signed-off-by: Mohammed Naser <[email protected]>
Co-authored-by: Mohammed Naser <[email protected]>
Co-authored-by: Claude <[email protected]>

Author: 3 people

roles/ceph_csi_rbd/tasks/main.yml

@@ -69,8 +69,8 @@
 - name: Store keyring inside fact
   run_once: true
   ansible.builtin.set_fact:
-    _ceph_rbd_csi_ceph_keyring:
-      key: "{{ ceph_csi_rbd_keyring | default((_ceph_key.stdout | from_json | first).key) }}"
+    ceph_csi_rbd_keyring: "{{ (_ceph_key.stdout | from_json | first).key }}"
+  when: ceph_csi_rbd_keyring is not defined
 
 - name: Deploy Helm chart
   run_once: true

roles/ceph_csi_rbd/vars/main.yml

@@ -52,4 +52,4 @@ _ceph_csi_rbd_helm_values:
   secret:
     create: true
     userID: "{{ ceph_csi_rbd_id }}"
-    userKey: "{{ _ceph_rbd_csi_ceph_keyring.key }}"
+    userKey: "{{ ceph_csi_rbd_keyring }}"