Skip to content

Commit 3a7c13a

Browse files
ahardin-rhahardin-rh
authored
Merge pull request #39758 from bscott-rh/OSDOCS-3020
OSDOCS3020- Added new disk provisioning type for vSphere IPI
2 parents e08e2c2 + a28c600 commit 3a7c13a

File tree

3 files changed

+47
-39
lines changed

3 files changed

+47
-39
lines changed

‎modules/installation-configuration-parameters.adoc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,10 @@ Optional VMware vSphere machine pool configuration parameters are described in t
12701270
|`platform.vsphere.memoryMB`
12711271
|The size of a virtual machine's memory in megabytes.
12721272
|Integer
1273+
1274+
|`platform.vsphere.diskType`
1275+
|The disk provisioning method. This value defaults to the vSphere default storage policy if not set.
1276+
|Valid values are `thin`, `thick`, or `eagerZeroedThick`.
12731277
|====
12741278

12751279
endif::vsphere,vmc[]

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,13 @@ platform:
7979
datacenter: datacenter
8080
defaultDatastore: datastore
8181
folder: folder
82+
diskType: thin <6>
8283
network: VM_Network
83-
cluster: vsphere_cluster_name <6>
84+
cluster: vsphere_cluster_name <7>
8485
apiVIP: api_vip
8586
ingressVIP: ingress_vip
8687
ifdef::restricted[]
87-
clusterOSImage: http://mirror.example.com/images/rhcos-48.83.202103221318-0-vmware.x86_64.ova <7>
88+
clusterOSImage: http://mirror.example.com/images/rhcos-47.83.202103221318-0-vmware.x86_64.ova <8>
8889
endif::restricted[]
8990
ifndef::openshift-origin[]
9091
fips: false
@@ -93,15 +94,15 @@ ifndef::restricted[]
9394
pullSecret: '{"auths": ...}'
9495
endif::restricted[]
9596
ifdef::restricted[]
96-
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <8>
97+
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <9>
9798
endif::restricted[]
9899
sshKey: 'ssh-ed25519 AAAA...'
99100
ifdef::restricted[]
100-
additionalTrustBundle: | <9>
101+
additionalTrustBundle: | <10>
101102
-----BEGIN CERTIFICATE-----
102103
ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
103104
-----END CERTIFICATE-----
104-
imageContentSources: <10>
105+
imageContentSources: <11>
105106
- mirrors:
106107
- <local_registry>/<local_repository_name>/release
107108
source: quay.io/openshift-release-dev/ocp-release
@@ -135,15 +136,16 @@ simultaneous multithreading.
135136
====
136137
<4> Optional: Provide additional configuration for the machine pool parameters for the compute and control plane machines.
137138
<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.
139+
<6> The vSphere disk provisioning method.
140+
<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.
139141
ifdef::restricted[]
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
142+
<8> The location of the {op-system-first} image that is accessible from the bastion server.
143+
<9> For `<local_registry>`, specify the registry domain name, and optionally the
142144
port, that your mirror registry uses to serve content. For example
143145
`registry.example.com` or `registry.example.com:5000`. For `<credentials>`,
144146
specify the base64-encoded user name and password for your mirror registry.
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.
147+
<10> Provide the contents of the certificate file that you used for your mirror registry.
148+
<11> Provide the `imageContentSources` section from the output of the command to mirror the repository.
147149
endif::restricted[]
148150

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

‎modules/installation-vsphere-config-yaml.adoc‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ parameters.
2525
----
2626
apiVersion: v1
2727
baseDomain: example.com <1>
28-
compute:
29-
- hyperthreading: Enabled <2> <3>
28+
compute: <2>
29+
- hyperthreading: Enabled <3>
3030
name: worker
3131
replicas: 0 <4>
32-
controlPlane:
33-
hyperthreading: Enabled <2> <3>
32+
controlPlane: <2>
33+
hyperthreading: Enabled <3>
3434
name: master
3535
replicas: 3 <5>
3636
metadata:
@@ -43,39 +43,40 @@ platform:
4343
datacenter: datacenter <10>
4444
defaultDatastore: datastore <11>
4545
folder: "/<datacenter_name>/vm/<folder_name>/<subfolder_name>" <12>
46+
diskType: thin <13>
4647
ifndef::restricted[]
4748
ifndef::openshift-origin[]
48-
fips: false <13>
49+
fips: false <14>
4950
endif::openshift-origin[]
5051
ifndef::openshift-origin[]
51-
pullSecret: '{"auths": ...}' <14>
52+
pullSecret: '{"auths": ...}' <15>
5253
endif::openshift-origin[]
5354
ifdef::openshift-origin[]
54-
pullSecret: '{"auths": ...}' <13>
55+
pullSecret: '{"auths": ...}' <14>
5556
endif::openshift-origin[]
5657
endif::restricted[]
5758
ifdef::restricted[]
5859
ifndef::openshift-origin[]
59-
fips: false <13>
60-
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <14>
60+
fips: false <14>
61+
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <15>
6162
endif::openshift-origin[]
6263
ifdef::openshift-origin[]
63-
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <13>
64+
pullSecret: '{"auths":{"<local_registry>": {"auth": "<credentials>","email": "[email protected]"}}}' <14>
6465
endif::openshift-origin[]
6566
endif::restricted[]
6667
ifndef::openshift-origin[]
67-
sshKey: 'ssh-ed25519 AAAA...' <15>
68+
sshKey: 'ssh-ed25519 AAAA...' <16>
6869
endif::openshift-origin[]
6970
ifdef::openshift-origin[]
70-
sshKey: 'ssh-ed25519 AAAA...' <14>
71+
sshKey: 'ssh-ed25519 AAAA...' <15>
7172
endif::openshift-origin[]
7273
ifdef::restricted[]
7374
ifndef::openshift-origin[]
74-
additionalTrustBundle: | <16>
75+
additionalTrustBundle: | <17>
7576
-----BEGIN CERTIFICATE-----
7677
ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
7778
-----END CERTIFICATE-----
78-
imageContentSources: <17>
79+
imageContentSources: <18>
7980
- mirrors:
8081
- <local_registry>/<local_repository_name>/release
8182
source: quay.io/openshift-release-dev/ocp-release
@@ -84,11 +85,11 @@ imageContentSources: <17>
8485
source: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8586
endif::openshift-origin[]
8687
ifdef::openshift-origin[]
87-
additionalTrustBundle: | <15>
88+
additionalTrustBundle: | <16>
8889
-----BEGIN CERTIFICATE-----
8990
ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
9091
-----END CERTIFICATE-----
91-
imageContentSources: <16>
92+
imageContentSources: <17>
9293
- mirrors:
9394
- <local_registry>/<local_repository_name>/release
9495
source: quay.io/openshift-release-dev/ocp-release
@@ -139,8 +140,9 @@ in vSphere.
139140
<10> The vSphere datacenter.
140141
<11> The default vSphere datastore to use.
141142
<12> Optional: For installer-provisioned infrastructure, the absolute path of an existing folder where the installation program creates the virtual machines, for example, `/<datacenter_name>/vm/<folder_name>/<subfolder_name>`. 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.
143+
<13> The vSphere disk provisioning method.
142144
ifndef::openshift-origin[]
143-
<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.
145+
<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.
144146
+
145147
[IMPORTANT]
146148
====
@@ -149,19 +151,19 @@ The use of FIPS Validated / Modules in Process cryptographic libraries is only s
149151
endif::openshift-origin[]
150152
ifndef::restricted[]
151153
ifndef::openshift-origin[]
152-
<14> The pull secret that you obtained from the
154+
<15> The pull secret that you obtained from the
153155
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
154156
provided by the included authorities, including Quay.io, which serves the
155157
container images for {product-title} components.
156-
<15> The public portion of the default SSH key for the `core` user in
158+
<16> The public portion of the default SSH key for the `core` user in
157159
{op-system-first}.
158160
endif::openshift-origin[]
159161
ifdef::openshift-origin[]
160-
<13> The pull secret that you obtained from the
162+
<14> The pull secret that you obtained from the
161163
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
162164
provided by the included authorities, including Quay.io, which serves the
163165
container images for {product-title} components.
164-
<14> The public portion of the default SSH key for the `core` user in
166+
<15> The public portion of the default SSH key for the `core` user in
165167
{op-system-first}.
166168
+
167169
[NOTE]
@@ -172,11 +174,11 @@ endif::openshift-origin[]
172174
endif::restricted[]
173175
ifdef::restricted[]
174176
ifndef::openshift-origin[]
175-
<14> For `<local_registry>`, specify the registry domain name, and optionally the
177+
<15> For `<local_registry>`, specify the registry domain name, and optionally the
176178
port, that your mirror registry uses to serve content. For example
177179
`registry.example.com` or `registry.example.com:5000`. For `<credentials>`,
178180
specify the base64-encoded user name and password for your mirror registry.
179-
<15> The public portion of the default SSH key for the `core` user in
181+
<16> The public portion of the default SSH key for the `core` user in
180182
{op-system-first}.
181183
+
182184
[NOTE]
@@ -185,11 +187,11 @@ For production {product-title} clusters on which you want to perform installatio
185187
====
186188
endif::openshift-origin[]
187189
ifdef::openshift-origin[]
188-
<13> For `<local_registry>`, specify the registry domain name, and optionally the
190+
<14> For `<local_registry>`, specify the registry domain name, and optionally the
189191
port, that your mirror registry uses to serve content. For example
190192
`registry.example.com` or `registry.example.com:5000`. For `<credentials>`,
191193
specify the base64-encoded user name and password for your mirror registry.
192-
<14> The public portion of the default SSH key for the `core` user in
194+
<15> The public portion of the default SSH key for the `core` user in
193195
{op-system-first}.
194196
+
195197
[NOTE]
@@ -200,15 +202,15 @@ endif::openshift-origin[]
200202
endif::restricted[]
201203
ifdef::restricted[]
202204
ifndef::openshift-origin[]
203-
<16> Provide the contents of the certificate file that you used for your mirror
205+
<17> Provide the contents of the certificate file that you used for your mirror
204206
registry.
205-
<17> Provide the `imageContentSources` section from the output of the command to
207+
<18> Provide the `imageContentSources` section from the output of the command to
206208
mirror the repository.
207209
endif::openshift-origin[]
208210
ifdef::openshift-origin[]
209-
<15> Provide the contents of the certificate file that you used for your mirror
211+
<16> Provide the contents of the certificate file that you used for your mirror
210212
registry.
211-
<16> Provide the `imageContentSources` section from the output of the command to
213+
<17> Provide the `imageContentSources` section from the output of the command to
212214
mirror the repository.
213215
endif::openshift-origin[]
214216
endif::restricted[]

0 commit comments

Comments
 (0)