From ff555ce0de9d5b2cd6835a58bca0e3988ae73f77 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Thu, 16 Mar 2023 09:15:05 +0100
Subject: [PATCH] Add missing keys

---
 .../workloadcluster/tasks/nodetemplates.yml   | 35 +++++++++----------
 .../kustomization.cluster-template.j2         |  2 ++
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/nodetemplates.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/nodetemplates.yml
index 2060474..aec266f 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/nodetemplates.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/nodetemplates.yml
@@ -25,7 +25,6 @@
       community.vmware.vmware_deploy_ovf:
         cluster: "{{ vcenter_info.cluster }}"
         datastore: "{{ vcenter_info.datastore }}"
-        folder: "{{ vcenter_info.folder }}"
         name: "{{ (item | basename | split('.'))[:-1] | join('.') }}"
         networks: "{u'{{ ova_spec.results[index].stdout | from_json | json_query('NetworkMapping[0].Name') }}':u'{{ vcenter_info.network }}'}"
         allow_duplicates: no
@@ -37,26 +36,25 @@
       loop_control:
         index_var: index
 
-    - name: Add vApp properties on deployed VM's
-      ansible.builtin.shell:
-        cmd: >-
-          npp-prepper \
-            --server "{{ vapp['hv.fqdn'] }}" \
-            --username "{{ vapp['hv.username'] }}" \
-            --password "{{ vapp['hv.password'] }}" \
-            vm \
-            --datacenter "{{ vcenter_info.datacenter }}" \
-            --portgroup "{{ vcenter_info.network }}" \
-            --name "{{ item.instance.hw_name }}"
-      when: existing_ova.results[index] is failed
-      loop: "{{ ova_deploy.results }}"
-      loop_control:
-        index_var: index
-        label: "{{ item.item }}"
+    # - name: Add vApp properties on deployed VM's
+    #   ansible.builtin.shell:
+    #     cmd: >-
+    #       npp-prepper \
+    #         --server "{{ vapp['hv.fqdn'] }}" \
+    #         --username "{{ vapp['hv.username'] }}" \
+    #         --password "{{ vapp['hv.password'] }}" \
+    #         vm \
+    #         --datacenter "{{ vcenter_info.datacenter }}" \
+    #         --portgroup "{{ vcenter_info.network }}" \
+    #         --name "{{ item.instance.hw_name }}"
+    #   when: existing_ova.results[index] is failed
+    #   loop: "{{ ova_deploy.results }}"
+    #   loop_control:
+    #     index_var: index
+    #     label: "{{ item.item }}"
 
     - name: Create snapshot on deployed VM's
       community.vmware.vmware_guest_snapshot:
-        folder: "{{ vcenter_info.folder }}"
         name: "{{ item.instance.hw_name }}"
         state: present
         snapshot_name: "{{ ansible_date_time.iso8601_basic_short }}-base"
@@ -83,3 +81,4 @@
       username: "{{ vapp['hv.username'] }}"
       password: "{{ vapp['hv.password'] }}"
       datacenter: "{{ vcenter_info.datacenter }}"
+      folder: "{{ vcenter_info.folder }}"
diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.cluster-template.j2 b/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.cluster-template.j2
index 064e3d8..f483ac8 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.cluster-template.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.cluster-template.j2
@@ -59,6 +59,8 @@ patchesStrategicMerge:
               - apiGroup: ipam.cluster.x-k8s.io
                 kind: InClusterIPPool
                 name: inclusterippool-${CLUSTER_NAME}
+              nameservers:
+              - {{ _template.network.dnsserver }}
               networkName: '${VSPHERE_NETWORK}'
   - |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1