Skip to content

Commit 6589331

Browse files
authored
Merge pull request #37136 from codyhoag/gh28191
GH#28191 Document what resource pool is used in vSphere installations
2 parents 67ab93e + 2f34de2 commit 6589331

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

modules/installation-initializing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ ifdef::vsphere,vmc[]
252252
The installation program connects to your vCenter instance.
253253
... Select the datacenter in your vCenter instance to connect to.
254254
... Select the default vCenter datastore to use.
255-
... Select the vCenter cluster to install the {product-title} cluster in.
255+
... Select the vCenter 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.
256256
... Select the network in the vCenter instance that contains the virtual IP addresses and DNS records that you configured.
257257
... Enter the virtual IP address that you configured for control plane API access.
258258
... Enter the virtual IP address that you configured for cluster ingress.

modules/installation-installer-provisioned-vsphere-config-yaml.adoc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ platform:
8080
defaultDatastore: datastore
8181
folder: folder
8282
network: VM_Network
83-
cluster: vsphere_cluster_name
83+
cluster: vsphere_cluster_name <6>
8484
apiVIP: api_vip
8585
ingressVIP: ingress_vip
8686
ifdef::restricted[]
87-
clusterOSImage: http://mirror.example.com/images/rhcos-48.83.202103221318-0-vmware.x86_64.ova <6>
87+
clusterOSImage: http://mirror.example.com/images/rhcos-48.83.202103221318-0-vmware.x86_64.ova <7>
8888
endif::restricted[]
8989
ifndef::openshift-origin[]
9090
fips: false
@@ -93,15 +93,15 @@ ifndef::restricted[]
9393
pullSecret: '{"auths": ...}'
9494
endif::restricted[]
9595
ifdef::restricted[]
96-
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <7>
96+
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <8>
9797
endif::restricted[]
9898
sshKey: 'ssh-ed25519 AAAA...'
9999
ifdef::restricted[]
100-
additionalTrustBundle: | <8>
100+
additionalTrustBundle: | <9>
101101
-----BEGIN CERTIFICATE-----
102102
ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
103103
-----END CERTIFICATE-----
104-
imageContentSources: <9>
104+
imageContentSources: <10>
105105
- mirrors:
106106
- <local_registry>/<local_repository_name>/release
107107
source: quay.io/openshift-release-dev/ocp-release
@@ -135,14 +135,15 @@ simultaneous multithreading.
135135
====
136136
<4> Optional: Provide additional configuration for the machine pool parameters for the compute and control plane machines.
137137
<5> The cluster name that you specified in your DNS records.
138+
<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.
138139
ifdef::restricted[]
139-
<6> The location of the {op-system-first} image that is accessible from the bastion server.
140-
<7> For `<local_registry>`, specify the registry domain name, and optionally the
140+
<7> The location of the {op-system-first} image that is accessible from the bastion server.
141+
<8> For `<local_registry>`, specify the registry domain name, and optionally the
141142
port, that your mirror registry uses to serve content. For example
142143
`registry.example.com` or `registry.example.com:5000`. For `<credentials>`,
143144
specify the base64-encoded user name and password for your mirror registry.
144-
<8> Provide the contents of the certificate file that you used for your mirror registry.
145-
<9> Provide the `imageContentSources` section from the output of the command to mirror the repository.
145+
<9> Provide the contents of the certificate file that you used for your mirror registry.
146+
<10> Provide the `imageContentSources` section from the output of the command to mirror the repository.
146147
endif::restricted[]
147148

148149
ifeval::["{context}" == "installing-vsphere-installer-provisioned-network-customizations"]

modules/installation-launching-installer.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ ifdef::vsphere[]
275275
The installation program connects to your vCenter instance.
276276
.. Select the datacenter in your vCenter instance to connect to.
277277
.. Select the default vCenter datastore to use.
278-
.. Select the vCenter cluster to install the {product-title} cluster in.
278+
.. Select the vCenter 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.
279279
.. Select the network in the vCenter instance that contains the virtual IP addresses and DNS records that you configured.
280280
.. Enter the virtual IP address that you configured for control plane API access.
281281
.. Enter the virtual IP address that you configured for cluster ingress.

0 commit comments

Comments
 (0)