From 44daf9191a57b446c19d3b86f6dc4946cf8c66f6 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Thu, 17 Nov 2022 10:17:17 +0100
Subject: [PATCH] Revert dict attribute;Move template;Add missing template
 attribute;Fix unique id in loop

---
 .../roles/workloadcluster/tasks/clusterapi.yml                | 3 ++-
 .../roles/workloadcluster/tasks/hypervisor.yml                | 2 +-
 .../{roles/workloadcluster => }/templates/clusterctl.j2       | 2 +-
 ansible/roles/metacluster/tasks/components.yml                | 4 +---
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename ansible/roles/firstboot/files/ansible_payload/{roles/workloadcluster => }/templates/clusterctl.j2 (97%)

diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/clusterapi.yml b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/clusterapi.yml
index 6e7fffc..14d9b41 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/clusterapi.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/clusterapi.yml
@@ -10,13 +10,14 @@
         infrastructure_vsphere: "{{ components.clusterapi.management.version.infrastructure_vsphere }}"
       hv:
         fqdn: "{{ vapp['hv.fqdn'] }}"
-        tlsthumbprint: "{{ vcenter_info.tls_thumbprint }}"
+        tlsthumbprint: "{{ tls_thumbprint.stdout }}"
         username: "{{ vapp['hv.username'] }}"
         password: "{{ vapp['hv.password'] }}"
         datacenter: "{{ vcenter_info.datacenter }}"
         datastore: "{{ vcenter_info.datastore }}"
         network: "{{ vcenter_info.network }}"
         resourcepool: "{{ vcenter_info.resourcepool }}"
+        folder: "{{ vcenter_info.folder }}"
       cluster:
         nodetemplate: "{{ (components.clusterapi.workload.node_template.name | split('.'))[:-1] | join('.') }}"
         publickey: "{{ vapp['guestinfo.rootsshkey'] }}"
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/hypervisor.yml b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/hypervisor.yml
index 964a022..a83da4c 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/hypervisor.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/hypervisor.yml
@@ -51,7 +51,7 @@
 
 - name: Store hypervisor details in dictionary
   ansible.builtin.set_fact:
-    vcenter_info: "{{ vcenter_info | default({}) | combine({ item.item.attribute : item.stdout }) | combine({ 'tls_thumbprint': tls_thumbprint.stdout }) }}"
+    vcenter_info: "{{ vcenter_info | default({}) | combine({ item.item.attribute : item.stdout }) }}"
   loop: "{{ govc_inventory.results }}"
   loop_control:
     label: "{{ item.item.attribute }}"
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/templates/clusterctl.j2 b/ansible/roles/firstboot/files/ansible_payload/templates/clusterctl.j2
similarity index 97%
rename from ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/templates/clusterctl.j2
rename to ansible/roles/firstboot/files/ansible_payload/templates/clusterctl.j2
index 82c9886..ee0289b 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/templates/clusterctl.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/templates/clusterctl.j2
@@ -27,7 +27,7 @@ VSPHERE_DATASTORE: "{{ _template.hv.datastore }}"
 VSPHERE_STORAGE_POLICY: ""
 VSPHERE_NETWORK: "{{ _template.hv.network }}"
 VSPHERE_RESOURCE_POOL: "{{ _template.hv.resourcepool }}"
-VSPHERE_FOLDER: ""
+VSPHERE_FOLDER: "{{ _template.hv.folder }}"
 
 VSPHERE_TEMPLATE: "{{ _template.cluster.nodetemplate }}"
 VSPHERE_SSH_AUTHORIZED_KEY: "{{ _template.cluster.publickey }}"
diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index 5cd9b79..15526f5 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -110,10 +110,8 @@
         --insecure-policy \
         --retry-times=5 \
         docker://{{ item }} \
-        docker-archive:./{{ ( item | regex_findall('[^/:]+'))[-2] }}_{{ uid }}.tar:{{ item }}
+        docker-archive:./{{ ( item | regex_findall('[^/:]+'))[-2] }}_{{ lookup('ansible.builtin.password', '/dev/null length=5 chars=ascii_lowercase,digits seed=item') }}.tar:{{ item }}
     chdir: /opt/metacluster/container-images
-  vars:
-    uid: "{{ lookup('ansible.builtin.password', '/dev/null length=5 chars=ascii_lowercase,digits seed=item') }}"
   loop: "{{ ((containerimages.results | map(attribute='stdout_lines') | select('defined') | flatten) + dependencies.container_images + (clusterapi_containerimages | list)) | unique }}"
 
 # - name: Inject manifests