Merge pull request #355 from appuio/vshphere-folder

Folder with infraID is created automatically by the installer
appuio · Oct 9, 2024 · ff33d9e · ff33d9e
2 parents 506a257 + 66a965d
commit ff33d9e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/modules/ROOT/pages/how-tos/vsphere/install.adoc b/docs/modules/ROOT/pages/how-tos/vsphere/install.adoc
@@ -64,7 +64,6 @@ 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
@@ -52,7 +52,7 @@ platform:
           networks:
             - ${VSPHERE_NETWORK}
           resourcePool: "/${VSPHERE_DATACENTER}/host/${VSPHERE_CLUSTER}//Resources"
-          folder: "/${VSPHERE_DATACENTER}/vm/${VSPHERE_FOLDER}"
+          folder: "" <3>
     ingressVIPs:
       - ${INGRESS_VIP}
     vcenters:
@@ -75,3 +75,4 @@ EOF
 Otherwise, the installation will most likely fail.
 <2> We only provision a single compute machine set.
 The final machine sets will be configured through Project Syn.
+<3> The installer will by default create a top-level folder with the vsphere infraID, but you can optionally choose an existing folder (https://docs.openshift.com/container-platform/4.15/installing/installing_vsphere/installation-config-parameters-vsphere.html#installation-configuration-parameters-additional-vsphere_installation-config-parameters-vsphere[docs]).
diff --git a/docs/modules/ROOT/partials/install/prepare-syn-config-vsphere.adoc b/docs/modules/ROOT/partials/install/prepare-syn-config-vsphere.adoc
@@ -14,6 +14,6 @@ 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}\"" \
+yq eval -i ".parameters.openshift.vsphere.folder = .parameters.openshift.infraID" \
   ${CLUSTER_ID}.yml
 ----