From 3e0785865e84c2787237459a6b65c28611ef20d9 Mon Sep 17 00:00:00 2001
From: Stephan Feurer <stephan.feurer@vshn.net>
Date: Tue, 18 Jun 2024 10:01:52 +0200
Subject: [PATCH] Update deprecated install-config.yaml parameters

Use the new format for install-config.yaml file as the old parameters
are deprecated. Also explicitly add the vSphere folder.
---
 .../ROOT/pages/how-tos/vsphere/install.adoc   |  1 +
 .../install/install-config-vsphere.adoc       | 27 +++++++++++++------
 .../install/prepare-syn-config-vsphere.adoc   |  3 +++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/docs/modules/ROOT/pages/how-tos/vsphere/install.adoc b/docs/modules/ROOT/pages/how-tos/vsphere/install.adoc
index 89dd45eb..eaca962f 100644
--- a/docs/modules/ROOT/pages/how-tos/vsphere/install.adoc
+++ b/docs/modules/ROOT/pages/how-tos/vsphere/install.adoc
@@ -64,6 +64,7 @@ export VSPHERE_CLUSTER=<cluster name>
 export VSPHERE_DATACENTER=<datacenter name>
 export VSPHERE_DATASTORE=<datastore name>
 export VSPHERE_NETWORK=<network name>
+export VSPHERE_FOLDER=<folder name>
 ----
 
 .Cluster machine network
diff --git a/docs/modules/ROOT/partials/install/install-config-vsphere.adoc b/docs/modules/ROOT/partials/install/install-config-vsphere.adoc
index 7250ee12..ee83f162 100644
--- a/docs/modules/ROOT/partials/install/install-config-vsphere.adoc
+++ b/docs/modules/ROOT/partials/install/install-config-vsphere.adoc
@@ -1,7 +1,7 @@
 [NOTE]
 ====
 You can add more options to the `install-config.yaml` file.
-Have a look at the https://docs.openshift.com/container-platform/4.13/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.html#installation-configuration-parameters_installing-vsphere-installer-provisioned-customizations[installation configuration parameters] for more information.
+Have a look at the https://docs.openshift.com/container-platform/latest/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.html#installation-configuration-parameters_installing-vsphere-installer-provisioned-customizations[installation configuration parameters] for more information.
 ====
 +
 [source,bash]
@@ -42,15 +42,26 @@ platform:
   vsphere:
     apiVIPs:
       - ${API_VIP}
-    cluster: ${VSPHERE_CLUSTER}
-    datacenter: ${VSPHERE_DATACENTER}
-    defaultDatastore: ${VSPHERE_DATASTORE}
+    failureDomains:
+      - name: datacenter
+        server: ${VCENTER_HOSTNAME}
+        topology:
+          computeCluster: "/${VSPHERE_DATACENTER}/host/${VSPHERE_CLUSTER}"
+          datacenter: ${VSPHERE_DATACENTER}
+          datastore: "/${VSPHERE_DATACENTER}/datastore/${VSPHERE_DATASTORE}"
+          networks:
+            - ${VSPHERE_NETWORK}
+          resourcePool: "/${VSPHERE_DATACENTER}/host/${VSPHERE_CLUSTER}//Resources"
+          folder: "/${VSPHERE_DATACENTER}/vm/${VSPHERE_FOLDER}"
     ingressVIPs:
       - ${INGRESS_VIP}
-    network: ${VSPHERE_NETWORK}
-    username: ${VSPHERE_USERNAME}
-    password: ${VSPHERE_PASSWORD}
-    vCenter: ${VCENTER_HOSTNAME}
+    vcenters:
+      - datacenters:
+          - ${VSPHERE_DATACENTER}
+        user: ${VSPHERE_USERNAME}
+        password: ${VSPHERE_PASSWORD}
+        server: ${VCENTER_HOSTNAME}
+        port: 443
 networking:
   networkType: Cilium
   machineNetwork:
diff --git a/docs/modules/ROOT/partials/install/prepare-syn-config-vsphere.adoc b/docs/modules/ROOT/partials/install/prepare-syn-config-vsphere.adoc
index 18439a42..9198dc96 100644
--- a/docs/modules/ROOT/partials/install/prepare-syn-config-vsphere.adoc
+++ b/docs/modules/ROOT/partials/install/prepare-syn-config-vsphere.adoc
@@ -13,4 +13,7 @@ yq eval -i ".parameters.openshift.vsphere.datastore = \"${VSPHERE_DATASTORE}\""
 
 yq eval -i ".parameters.openshift.vsphere.server = \"${VCENTER_HOSTNAME}\"" \
   ${CLUSTER_ID}.yml
+
+yq eval -i ".parameters.openshift.vsphere.folder = \"${VSPHERE_FOLDER}\"" \
+  ${CLUSTER_ID}.yml
 ----