From 28700415305bffb4b1d5de016e10fc898874997c Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Mon, 30 Jan 2023 14:26:28 +0100
Subject: [PATCH] Fix typo;Add debugging;Add missing key

---
 .../roles/metacluster/tasks/certauthority.yml          |  2 +-
 .../upgrade/roles/metacluster/tasks/storage.yml        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/certauthority.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/certauthority.yml
index 26f2b98..9cdfca9 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/certauthority.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/certauthority.yml
@@ -20,7 +20,7 @@
         # Unable to use REST api based readycheck due to lack of ingress
         wait: yes
         kubeconfig: "{{ kubeconfig.path }}"
-        values-files:
+        values_files:
           - "{{ values_file.path }}"
 
     - name: Cleanup tempfile
diff --git a/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/storage.yml b/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/storage.yml
index abea181..2b3fbc7 100644
--- a/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/storage.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/upgrade/roles/metacluster/tasks/storage.yml
@@ -14,12 +14,20 @@
       loop_control:
         label: "{{ item.metadata.name }}"
 
+    - ansible.builtin.uri:
+        url: https://storage.{{ vapp['metacluster.fqdn'] }}/v1/volumes
+        method: GET
+      register: debug_volume_details
+    - debug:
+        msg: "{{ debug_volume_details }}"
+
     - name: Wait for replica rebuilds to complete
       ansible.builtin.uri:
         url: https://storage.{{ vapp['metacluster.fqdn'] }}/v1/volumes
         method: GET
       register: volume_details
       until:
+        - volume_details.json.data is defined
         - (volume_details.json.data | json_query('[*].robustness') | unique | length) == 1
         - (volume_details.json.data | json_query('[*].robustness') | first) == "healthy"
       retries: "{{ playbook.retries }}"
@@ -33,6 +41,8 @@
         create_namespace: yes
         wait: no
         values: "{{ components.longhorn.chart_values }}"
+        # Workaround; module_defaults are not respected by this module
+        kubeconfig: "{{ kubeconfig.path }}"
 
     - name: Ensure longhorn API availability
       ansible.builtin.uri: