diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index 0ed9db0f0a..140632b608 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -1271,6 +1271,10 @@ Optional VMware vSphere machine pool configuration parameters are described in t |`platform.vsphere.memoryMB` |The size of a virtual machine's memory in megabytes. |Integer + +|`platform.vsphere.diskType` +|The disk provisioning method. This value defaults to the vSphere default storage policy if not set. +|Valid values are `thin`, `thick`, or `eagerZeroedThick`. |==== endif::vsphere,vmc[] diff --git a/modules/installation-installer-provisioned-vsphere-config-yaml.adoc b/modules/installation-installer-provisioned-vsphere-config-yaml.adoc index b3d9182a27..6bde33f652 100644 --- a/modules/installation-installer-provisioned-vsphere-config-yaml.adoc +++ b/modules/installation-installer-provisioned-vsphere-config-yaml.adoc @@ -79,12 +79,13 @@ platform: datacenter: datacenter defaultDatastore: datastore folder: folder + diskType: thin <6> network: VM_Network - cluster: vsphere_cluster_name <6> + cluster: vsphere_cluster_name <7> apiVIP: api_vip ingressVIP: ingress_vip ifdef::restricted[] - clusterOSImage: http://mirror.example.com/images/rhcos-48.83.202103221318-0-vmware.x86_64.ova <7> + clusterOSImage: http://mirror.example.com/images/rhcos-47.83.202103221318-0-vmware.x86_64.ova <8> endif::restricted[] ifndef::openshift-origin[] fips: false @@ -93,15 +94,15 @@ ifndef::restricted[] pullSecret: '{"auths": ...}' endif::restricted[] ifdef::restricted[] -pullSecret: '{"auths":{"": {"auth": "","email": "you@example.com"}}}' <8> +pullSecret: '{"auths":{"": {"auth": "","email": "you@example.com"}}}' <9> endif::restricted[] sshKey: 'ssh-ed25519 AAAA...' ifdef::restricted[] -additionalTrustBundle: | <9> +additionalTrustBundle: | <10> -----BEGIN CERTIFICATE----- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -----END CERTIFICATE----- -imageContentSources: <10> +imageContentSources: <11> - mirrors: - //release source: quay.io/openshift-release-dev/ocp-release @@ -135,15 +136,16 @@ simultaneous multithreading. ==== <4> Optional: Provide additional configuration for the machine pool parameters for the compute and control plane machines. <5> The cluster name that you specified in your DNS records. -<6> The vSphere cluster to install the {product-title} cluster in. The installation program uses the root resource pool of the vSphere cluster as the default resource pool. +<6> The vSphere disk provisioning method. +<7> The vSphere cluster to install the {product-title} cluster in. The installation program uses the root resource pool of the vSphere cluster as the default resource pool. ifdef::restricted[] -<7> The location of the {op-system-first} image that is accessible from the bastion server. -<8> For ``, specify the registry domain name, and optionally the +<8> The location of the {op-system-first} image that is accessible from the bastion server. +<9> 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. -<9> Provide the contents of the certificate file that you used for your mirror registry. -<10> Provide the `imageContentSources` section from the output of the command to mirror the repository. +<10> Provide the contents of the certificate file that you used for your mirror registry. +<11> Provide the `imageContentSources` section from the output of the command to mirror the repository. endif::restricted[] ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"] diff --git a/modules/installation-vsphere-config-yaml.adoc b/modules/installation-vsphere-config-yaml.adoc index a5aa2555a7..5a88252353 100644 --- a/modules/installation-vsphere-config-yaml.adoc +++ b/modules/installation-vsphere-config-yaml.adoc @@ -25,12 +25,12 @@ parameters. ---- apiVersion: v1 baseDomain: example.com <1> -compute: -- hyperthreading: Enabled <2> <3> +compute: <2> +- hyperthreading: Enabled <3> name: worker replicas: 0 <4> -controlPlane: - hyperthreading: Enabled <2> <3> +controlPlane: <2> + hyperthreading: Enabled <3> name: master replicas: 3 <5> metadata: @@ -43,39 +43,40 @@ platform: datacenter: datacenter <10> defaultDatastore: datastore <11> folder: "//vm//" <12> + diskType: thin <13> ifndef::restricted[] ifndef::openshift-origin[] -fips: false <13> +fips: false <14> endif::openshift-origin[] ifndef::openshift-origin[] +pullSecret: '{"auths": ...}' <15> +endif::openshift-origin[] +ifdef::openshift-origin[] pullSecret: '{"auths": ...}' <14> endif::openshift-origin[] -ifdef::openshift-origin[] -pullSecret: '{"auths": ...}' <13> -endif::openshift-origin[] endif::restricted[] ifdef::restricted[] ifndef::openshift-origin[] -fips: false <13> +fips: false <14> +pullSecret: '{"auths":{"": {"auth": "","email": "you@example.com"}}}' <15> +endif::openshift-origin[] +ifdef::openshift-origin[] pullSecret: '{"auths":{"": {"auth": "","email": "you@example.com"}}}' <14> endif::openshift-origin[] -ifdef::openshift-origin[] -pullSecret: '{"auths":{"": {"auth": "","email": "you@example.com"}}}' <13> -endif::openshift-origin[] endif::restricted[] ifndef::openshift-origin[] -sshKey: 'ssh-ed25519 AAAA...' <15> +sshKey: 'ssh-ed25519 AAAA...' <16> endif::openshift-origin[] ifdef::openshift-origin[] -sshKey: 'ssh-ed25519 AAAA...' <14> +sshKey: 'ssh-ed25519 AAAA...' <15> endif::openshift-origin[] ifdef::restricted[] ifndef::openshift-origin[] -additionalTrustBundle: | <16> +additionalTrustBundle: | <17> -----BEGIN CERTIFICATE----- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -----END CERTIFICATE----- -imageContentSources: <17> +imageContentSources: <18> - mirrors: - //release source: quay.io/openshift-release-dev/ocp-release @@ -84,11 +85,11 @@ imageContentSources: <17> source: quay.io/openshift-release-dev/ocp-v4.0-art-dev endif::openshift-origin[] ifdef::openshift-origin[] -additionalTrustBundle: | <15> +additionalTrustBundle: | <16> -----BEGIN CERTIFICATE----- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -----END CERTIFICATE----- -imageContentSources: <16> +imageContentSources: <17> - mirrors: - //release source: quay.io/openshift-release-dev/ocp-release @@ -139,8 +140,9 @@ in vSphere. <10> The vSphere datacenter. <11> The default vSphere datastore to use. <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> The vSphere disk provisioning method. ifndef::openshift-origin[] -<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. +<14> 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. + [IMPORTANT] ==== @@ -149,20 +151,20 @@ The use of FIPS Validated / Modules in Process cryptographic libraries is only s endif::openshift-origin[] ifndef::restricted[] ifndef::openshift-origin[] +<15> The pull secret that you obtained from the +link:https://console.redhat.com/openshift/install/pull-secret[Pull Secret] page on the {console-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. +<16> The public portion of the default SSH key for the `core` user in +{op-system-first}. +endif::openshift-origin[] +ifdef::openshift-origin[] <14> The pull secret that you obtained from the link:https://console.redhat.com/openshift/install/pull-secret[Pull Secret] page on the {console-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. <15> The public portion of the default SSH key for the `core` user in {op-system-first}. -endif::openshift-origin[] -ifdef::openshift-origin[] -<13> The pull secret that you obtained from the -link:https://console.redhat.com/openshift/install/pull-secret[Pull Secret] page on the {console-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. -<14> The public portion of the default SSH key for the `core` user in -{op-system-first}. + [NOTE] ==== @@ -172,6 +174,19 @@ endif::openshift-origin[] endif::restricted[] ifdef::restricted[] ifndef::openshift-origin[] +<15> 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. +<16> The public portion of the default SSH key for the `core` user in +{op-system-first}. ++ +[NOTE] +==== +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. +==== +endif::openshift-origin[] +ifdef::openshift-origin[] <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 ``, @@ -184,31 +199,18 @@ specify the base64-encoded user name and password for your mirror registry. 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. ==== endif::openshift-origin[] -ifdef::openshift-origin[] -<13> 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. -<14> The public portion of the default SSH key for the `core` user in -{op-system-first}. -+ -[NOTE] -==== -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. -==== -endif::openshift-origin[] endif::restricted[] ifdef::restricted[] ifndef::openshift-origin[] -<16> Provide the contents of the certificate file that you used for your mirror +<17> Provide the contents of the certificate file that you used for your mirror registry. -<17> Provide the `imageContentSources` section from the output of the command to +<18> Provide the `imageContentSources` section from the output of the command to mirror the repository. endif::openshift-origin[] ifdef::openshift-origin[] -<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::openshift-origin[] endif::restricted[]