From fe8700f3000fb956ca47c83ea22fcfa4cf5bd655 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Tue, 8 Nov 2022 19:46:37 +0100
Subject: [PATCH] Housekeeping;Add missing key to dict

---
 .../roles/workloadcluster/tasks/clusterapi.yml               | 1 +
 .../roles/workloadcluster/tasks/hypervisor.yml               | 5 +++++
 scripts/Update-OvfConfiguration.yml                          | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

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 e95aa0b..4218350 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
@@ -21,6 +21,7 @@
         datacenter: "{{ vcenter_info.datacenter }}"
         datastore: "{{ vcenter_info.datastore }}"
         network: "{{ vcenter_info.network }}"
+        resourcepool: "{{ vcenter_info.resourcepool }}"
       cluster:
         publickey: "{{ vapp['guestinfo.rootsshkey'] }}"
         version: "{{ components.clusterapi.workload.version.k8s }}"
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 7408cad..69a1d7d 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
@@ -36,6 +36,11 @@
         $(govc object.collect -json VirtualMachine:{{ moref_id }} | \
           jq -r '.[] | select(.Name == "network").Val.ManagedObjectReference | .[].Type + ":" + .[].Value')
       part: NF
+    - attribute: resourcepool
+      moref: >-
+        $(govc object.collect -json /DeSchakel/vm/Kubernetes.Bootstrap.Appliance2 |
+          jq -r '.[] | select(.Name == "resourcePool").Val | .Type + ":" + .Value')
+      part: 0
   loop_control:
     label: "{{ item.attribute }}"
 
diff --git a/scripts/Update-OvfConfiguration.yml b/scripts/Update-OvfConfiguration.yml
index 4cca1d1..a5e74a7 100644
--- a/scripts/Update-OvfConfiguration.yml
+++ b/scripts/Update-OvfConfiguration.yml
@@ -159,7 +159,7 @@ PropertyCategories:
 
   - Key: hv.password
     Type: password(1..)
-    Label: vCenter password ...*
+    Label: vCenter password*
     Description: The password which this bootstrap appliance will authenticate with to the vCenter instance.
     DefaultValue: ''
     Configurations: '*'