diff --git a/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc index 70866bb4ad..e5e57b985e 100644 --- a/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc +++ b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc @@ -1,5 +1,5 @@ [id="installing-restricted-networks-vsphere"] -= Installing a cluster on vSphere in a restricted network += Installing a cluster on vSphere in a restricted network with user-provisioned infrastructure include::modules/common-attributes.adoc[] :context: installing-restricted-networks-vsphere @@ -62,6 +62,8 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2] include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1] +include::modules/installation-extracting-infraid.adoc[leveloffset=+1] + include::modules/installation-vsphere-machines.adoc[leveloffset=+1] include::modules/installation-installing-bare-metal.adoc[leveloffset=+1] diff --git a/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc b/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc index 63f526da82..f81318aaeb 100644 --- a/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-installer-provisioned-customizations.adoc @@ -14,6 +14,7 @@ VMware vSphere instance by using installer-provisioned infrastructure. To custom xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[persistent storage] for your cluster. To deploy a private image registry, your storage must provide ReadWriteMany access modes. +* Ensure that your vSphere server has only one datacenter and cluster. If it has multiple datacenters and clusters, it also has multiple default root resource pools, and the worker nodes will not provision during installation. * Review details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. diff --git a/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc b/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc index f4378f6fcd..af5d190b61 100644 --- a/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc @@ -16,6 +16,7 @@ You must set most of the network configuration parameters during installation, a xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[persistent storage] for your cluster. To deploy a private image registry, your storage must provide ReadWriteMany access modes. +* Ensure that your vSphere server has only one datacenter and cluster. If it has multiple datacenters and clusters, it also has multiple default root resource pools, and the worker nodes will not provision during installation. * Review details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. diff --git a/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc b/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc index f4da8b4a68..77429c790b 100644 --- a/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc +++ b/installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc @@ -14,6 +14,7 @@ VMware vSphere instance by using installer-provisioned infrastructure. xref:../../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[persistent storage] for your cluster. To deploy a private image registry, your storage must provide ReadWriteMany access modes. +* Ensure that your vSphere server has only one datacenter and cluster. If it has multiple datacenters and clusters, it also has multiple default root resource pools, and the worker nodes will not provision during installation. * Review details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes. diff --git a/installing/installing_vsphere/installing-vsphere-network-customizations.adoc b/installing/installing_vsphere/installing-vsphere-network-customizations.adoc index 9a42ab6e96..f70d5a6669 100644 --- a/installing/installing_vsphere/installing-vsphere-network-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-network-customizations.adoc @@ -53,6 +53,8 @@ include::modules/nw-operator-cr.adoc[leveloffset=+1] include::modules/installation-generate-ignition-configs.adoc[leveloffset=+1] +include::modules/installation-extracting-infraid.adoc[leveloffset=+1] + include::modules/installation-vsphere-machines.adoc[leveloffset=+1] include::modules/cli-installing-cli.adoc[leveloffset=+1] diff --git a/installing/installing_vsphere/installing-vsphere.adoc b/installing/installing_vsphere/installing-vsphere.adoc index c76672b866..f6421bf69b 100644 --- a/installing/installing_vsphere/installing-vsphere.adoc +++ b/installing/installing_vsphere/installing-vsphere.adoc @@ -1,5 +1,5 @@ [id="installing-vsphere"] -= Installing a cluster on vSphere += Installing a cluster on vSphere with user-provisioned infrastructure include::modules/common-attributes.adoc[] :context: installing-vsphere @@ -51,6 +51,8 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2] include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1] +include::modules/installation-extracting-infraid.adoc[leveloffset=+1] + include::modules/installation-vsphere-machines.adoc[leveloffset=+1] include::modules/cli-installing-cli.adoc[leveloffset=+1] diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index 8bcade4790..0e2e114360 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -623,7 +623,7 @@ in vSphere. |String. |`platform.vsphere.folder` -|_Optional_. The absolute path of an existing folder where the installation program creates the virtual machines. create VMs. If you do not provide this value, the installation program creates a folder that is named with the cluster ID is created in the datacenter virtual machine folder. +|_Optional_. The absolute path of an existing folder where the installation program creates the virtual machines. If you do not provide this value, the installation program creates a folder that is named with the infrastructure ID in the datacenter virtual machine folder. |String, for example, `//vm//`. |`platform.vsphere.network` diff --git a/modules/installation-extracting-infraid.adoc b/modules/installation-extracting-infraid.adoc index ac8ddb6359..20b7abea9d 100644 --- a/modules/installation-extracting-infraid.adoc +++ b/modules/installation-extracting-infraid.adoc @@ -5,6 +5,8 @@ // * installing/installing_azure/installing-azure-user-infra.adoc // * installing/installing_gcp/installing-gcp-user-infra.adoc // * installing/installing_gcp/installing-restricted-networks-gcp.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc +// * installing/installing_vsphere/installing-vsphere.adoc ifeval::["{context}" == "installing-aws-user-infra"] :cp-first: Amazon Web Services @@ -43,24 +45,39 @@ ifeval::["{context}" == "installing-restricted-networks-gcp"] :cp-template: Deployment Manager :gcp: endif::[] +ifeval::["{context}" == "installing-restricted-networks-vsphere"] +:cp-first: VMware vSphere +:cp: vSphere +:vsphere: +endif::[] +ifeval::["{context}" == "installing-vsphere"] +:cp-first: VMware vSphere +:cp: vSphere +:vsphere: +endif::[] [id="installation-extracting-infraid_{context}"] = Extracting the infrastructure name ifdef::aws,gcp[] -The Ignition configs contain a unique cluster identifier that you can use to +The Ignition config files contain a unique cluster identifier that you can use to uniquely identify your cluster in {cp-first} ({cp}). The provided {cp-template} templates contain references to this infrastructure name, so you must extract it. endif::aws,gcp[] ifdef::azure[] -The Ignition configs contain a unique cluster identifier that you can use to +The Ignition config files contain a unique cluster identifier that you can use to uniquely identify your cluster in {cp-first}. The provided {cp-template-first} ({cp-template}) templates contain references to this infrastructure name, so you must extract it. endif::azure[] +ifdef::vsphere[] +The Ignition config files contain a unique cluster identifier that you can use to +uniquely identify your cluster in {cp-first}. If you plan to use the cluster identifier as the name of your virtual machine folder, you must extract it. +endif::vsphere[] + .Prerequisites * Obtain the {product-title} installation program and the pull secret for your cluster. @@ -123,3 +140,13 @@ ifeval::["{context}" == "installing-restricted-networks-gcp"] :!cp-template: :!gcp: endif::[] +ifeval::["{context}" == "installing-restricted-networks-vsphere"] +:!cp-first: VMware vSphere +:!cp: vSphere +:!vsphere: +endif::[] +ifeval::["{context}" == "installing-vsphere"] +:!cp-first: VMware vSphere +:!cp: vSphere +:!vsphere: +endif::[] diff --git a/modules/installation-vsphere-config-yaml.adoc b/modules/installation-vsphere-config-yaml.adoc index b3e7e51b3c..51c5b0a5f8 100644 --- a/modules/installation-vsphere-config-yaml.adoc +++ b/modules/installation-vsphere-config-yaml.adoc @@ -36,21 +36,22 @@ platform: password: password <9> datacenter: datacenter <10> defaultDatastore: datastore <11> + folder: "//vm//" <12> ifndef::restricted[] -fips: false <12> -pullSecret: '{"auths": ...}' <13> +fips: false <13> +pullSecret: '{"auths": ...}' <14> endif::restricted[] ifdef::restricted[] -fips: false <12> -pullSecret: '{"auths":{"": {"auth": "","email": "you@example.com"}}}' <13> +fips: false <13> +pullSecret: '{"auths":{"": {"auth": "","email": "you@example.com"}}}' <14> endif::restricted[] -sshKey: 'ssh-ed25519 AAAA...' <14> +sshKey: 'ssh-ed25519 AAAA...' <15> ifdef::restricted[] -additionalTrustBundle: | <15> +additionalTrustBundle: | <16> -----BEGIN CERTIFICATE----- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -----END CERTIFICATE----- -imageContentSources: <16> +imageContentSources: <17> - mirrors: - //release source: quay.io/openshift-release-dev/ocp-release @@ -99,20 +100,21 @@ in vSphere. <9> The password associated with the vSphere user. <10> The vSphere datacenter. <11> The default vSphere datastore to use. -<12> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead. +<12> Optional: For installer-provisioned infrastructure, the absolute path of an existing folder where the installation program creates the virtual machines, for example, `//vm//`. If you do not provide this value, the installation program creates a top-level folder in the datacenter virtual machine folder that is named with the infrastructure ID. If you are providing the infrastructure for the cluster, omit this parameter. +<13> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead. ifndef::restricted[] -<13> The pull secret that you obtained from the +<14> The pull secret that you obtained from the link:https://cloud.redhat.com/openshift/install/pull-secret[Pull Secret] page on the {cloud-redhat-com} site. This pull secret allows you to authenticate with the services that are provided by the included authorities, including Quay.io, which serves the container images for {product-title} components. endif::restricted[] ifdef::restricted[] -<13> For ``, specify the registry domain name, and optionally the +<14> For ``, specify the registry domain name, and optionally the port, that your mirror registry uses to serve content. For example `registry.example.com` or `registry.example.com:5000`. For ``, specify the base64-encoded user name and password for your mirror registry. endif::restricted[] -<14> The public portion of the default SSH key for the `core` user in +<15> The public portion of the default SSH key for the `core` user in {op-system-first}. + [NOTE] @@ -120,9 +122,9 @@ endif::restricted[] For production {product-title} clusters on which you want to perform installation debugging or disaster recovery, specify an SSH key that your `ssh-agent` process uses. ==== ifdef::restricted[] -<15> Provide the contents of the certificate file that you used for your mirror +<16> Provide the contents of the certificate file that you used for your mirror registry. -<16> Provide the `imageContentSources` section from the output of the command to +<17> Provide the `imageContentSources` section from the output of the command to mirror the repository. endif::restricted[] diff --git a/modules/installation-vsphere-machines.adoc b/modules/installation-vsphere-machines.adoc index 94a1e39d25..bb582c31da 100644 --- a/modules/installation-vsphere-machines.adoc +++ b/modules/installation-vsphere-machines.adoc @@ -126,8 +126,7 @@ endif::openshift-origin[] .. Click the *VMs and Templates* view. .. Right-click the name of your datacenter. .. Click *New Folder* -> *New VM and Template Folder*. -.. In the window that is displayed, enter the folder name. The folder name must -match the cluster name that you specified in the `install-config.yaml` file. +.. In the window that is displayed, enter the folder name. If you did not specify an existing folder in the `install-config.yaml` file, then create a folder with the same name as the infrastructure ID. . In the vSphere Client, create a template for the OVA image. +