Skip to content

Commit 6502ae2

Browse files
authored
Merge pull request #64748 from dfitzmau/OCPBUGS-18561
OCPBUGS-18561: Added prere to vSphere docs for reachable vCenter
2 parents efe9f22 + 8084a29 commit 6502ae2

File tree

4 files changed

+127
-56
lines changed

4 files changed

+127
-56
lines changed

installing/installing_vsphere/installing-vsphere-network-customizations.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ configuration options. By customizing your network configuration, your cluster
1212
can coexist with existing IP address allocations in your environment and
1313
integrate with existing MTU and VXLAN configurations.
1414

15+
include::snippets/vcenter-support.adoc[]
16+
1517
You must set most of the network configuration parameters during installation,
1618
and you can modify only `kubeProxy` configuration parameters in a running
1719
cluster.
1820

19-
include::snippets/vcenter-support.adoc[]
20-
2121
[IMPORTANT]
2222
====
2323
The steps for performing a user-provisioned infrastructure installation are provided as an example only. Installing a cluster with infrastructure you provide requires knowledge of the vSphere platform and the installation process of {product-title}. Use the user-provisioned infrastructure installation instructions as a guide; you are free to create the required resources through other methods.

modules/installation-configuration-parameters.adoc

Lines changed: 97 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,56 +1562,82 @@ ifdef::vsphere[]
15621562
Additional VMware vSphere configuration parameters are described in the following table:
15631563

15641564
.Additional VMware vSphere cluster parameters
1565-
[cols=".^2,.^3a,.^3a",options="header"]
1565+
[cols=".^2,.^4,.^2",options="header"]
15661566
|====
15671567
|Parameter|Description|Values
15681568

1569-
|`platform.vsphere.apiVIPs`
1569+
l|platform:
1570+
vsphere
1571+
apiVIPs
15701572
|Virtual IP (VIP) addresses that you configured for control plane API access.
1571-
a|Multiple IP addresses
1573+
|Multiple IP addresses
15721574

1573-
|`platform.vsphere.diskType`
1575+
l|platform
1576+
vsphere
1577+
diskType
15741578
|Optional. The disk provisioning method. This value defaults to the vSphere default storage policy if not set.
15751579
|Valid values are `thin`, `thick`, or `eagerZeroedThick`.
15761580

1577-
|`platform.vsphere.failureDomains`
1581+
l|platform
1582+
vsphere
1583+
failureDomains
15781584
|Establishes the relationships between a region and zone. You define a failure domain by using vCenter objects, such as a `datastore` object. A failure domain defines the vCenter location for {product-title} cluster nodes.
15791585
|String
15801586

1581-
|`platform.vsphere.failureDomains.topology.networks`
1587+
l|platform
1588+
vsphere
1589+
failureDomains
1590+
topology
1591+
networks
15821592
|Lists any network in the vCenter instance that contains the virtual IP addresses and DNS records that you configured.
15831593
|String
15841594

1585-
|`platform.vsphere.failureDomains.region`
1595+
l|platform
1596+
vsphere
1597+
failureDomains
1598+
region
15861599
|If you define multiple failure domains for your cluster, you must attach the tag to each vCenter datacenter. To define a region, use a tag from the `openshift-region` tag category. For a single vSphere datacenter environment, you do not need to attach a tag, but you must enter an alphanumeric value, such as `datacenter`, for the parameter.
15871600
|String
15881601

1589-
|`platform.vsphere.failureDomains.zone`
1602+
l|platform
1603+
vsphere
1604+
failureDomains
1605+
zone
15901606
|If you define multiple failure domains for your cluster, you must attach the tag to each vCenter cluster. To define a zone, use a tag from the `openshift-zone` tag category. For a single vSphere datacenter environment, you do not need to attach a tag, but you must enter an alphanumeric value, such as `cluster`, for the parameter.
15911607
|String
15921608

1593-
|`platform.vsphere.failureDomains.template`
1609+
l|platform
1610+
vsphere
1611+
failureDomains
1612+
template
15941613
|Specify the absolute path to a pre-existing {op-system-first} image template or virtual machine. The installation program can use the image template or virtual machine to quickly install {op-system} on vSphere hosts. Consider using this parameter as an alternative to uploading an {op-system} image on vSphere hosts. The parameter is available for use only on installer-provisioned infrastructure.
15951614
|String
15961615

1597-
|`platform.vsphere.ingressVIPs`
1616+
l|platform
1617+
vsphere
1618+
ingressVIPs
15981619
|Virtual IP (VIP) addresses that you configured for cluster Ingress.
15991620
|Multiple IP addresses
16001621

1601-
|`platform.vsphere`
1622+
l|platform
1623+
vsphere
16021624
| Describes your account on the cloud platform that hosts your cluster. You can use the parameter to customize the platform. When providing additional configuration settings for compute and control plane machines in the machine pool, the parameter is optional. You can only specify one vCenter server for your {product-title} cluster.
16031625
|String
16041626

1605-
|`platform.vsphere.vcenters`
1627+
l|platform
1628+
vsphere
1629+
vcenters
16061630
|Lists any fully-qualified hostname or IP address of a vCenter server.
16071631
|String
16081632

1609-
|`platform.vsphere.vcenters.datacenters`
1633+
l|platform
1634+
vsphere
1635+
vcenters
1636+
datacenters
16101637
|Lists and defines the datacenters where {product-title} virtual machines (VMs) operate. The list of datacenters must match the list of datacenters specified in the `failureDomains` field.
16111638
|String
16121639
|====
16131640

1614-
16151641
[id="deprecated-parameters-vsphere_{context}"]
16161642
== Deprecated VMware vSphere configuration parameters
16171643

@@ -1620,96 +1646,122 @@ In {product-title} 4.13, the following vSphere configuration parameters are depr
16201646
The following table lists each deprecated vSphere configuration parameter:
16211647

16221648
.Deprecated VMware vSphere cluster parameters
1623-
[cols=".^2,.^3a,.^3a",options="header"]
1649+
[cols=".^2,.^4,.^2",options="header,word-wrap",subs="+quotes,+attributes"]
16241650
|====
16251651
|Parameter|Description|Values
16261652

1627-
|`platform.vsphere.apiVIP`
1653+
l|platform
1654+
vsphere
1655+
apiVIP
16281656
|The virtual IP (VIP) address that you configured for control plane API access.
1629-
a|An IP address, for example `128.0.0.1`.
16301657

1631-
[NOTE]
1632-
====
1633-
In {product-title} 4.12 and later, the `apiVIP` configuration setting is deprecated. Instead, use a `List` format to enter a value in the `apiVIPs` configuration setting.
1634-
====
1658+
*Note:* In {product-title} 4.12 and later, the `apiVIP` configuration setting is deprecated. Instead, use a `List` format to enter a value in the `apiVIPs` configuration setting.
1659+
a|An IP address, for example `128.0.0.1`.
16351660

1636-
|`platform.vsphere.cluster`
1661+
l|platform
1662+
vsphere
1663+
cluster
16371664
|The vCenter cluster to install the {product-title} cluster in.
16381665
|String
16391666

1640-
|`platform.vsphere.datacenter`
1667+
l|platform
1668+
vsphere
1669+
datacenter
16411670
|Defines the datacenter where {product-title} virtual machines (VMs) operate.
16421671
|String
16431672

1644-
|`platform.vsphere.defaultDatastore`
1673+
l|platform
1674+
vsphere
1675+
defaultDatastore
16451676
|The name of the default datastore to use for provisioning volumes.
16461677
|String
16471678

1648-
|`platform.vsphere.folder`
1679+
l|platform
1680+
vsphere
1681+
folder
16491682
|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 data center virtual machine folder.
16501683
|String, for example, `/<datacenter_name>/vm/<folder_name>/<subfolder_name>`.
16511684

1652-
|`platform.vsphere.ingressVIP`
1653-
|Virtual IP (VIP) addresses that you configured for cluster Ingress.
1654-
a|An IP address, for example `128.0.0.1`.
1685+
l|platform
1686+
vsphere
1687+
ingressVIP
1688+
|Virtual IP (VIP) addresses that you configured for cluster Ingress.
16551689

1656-
[NOTE]
1657-
====
1658-
In {product-title} 4.12 and later, the `ingressVIP` configuration setting is deprecated. Instead, use a `List` format to enter a value in the `ingressVIPs` configuration setting.
1659-
====
1690+
*Note:* In {product-title} 4.12 and later, the `ingressVIP` configuration setting is deprecated. Instead, use a `List` format to enter a value in the `ingressVIPs` configuration setting.
1691+
a|An IP address, for example `128.0.0.1`.
16601692

1661-
|`platform.vsphere.network`
1693+
l|platform
1694+
vsphere
1695+
network
16621696
|The network in the vCenter instance that contains the virtual IP addresses and DNS records that you configured.
16631697
|String
16641698

1665-
|`platform.vsphere.password`
1699+
l|platform
1700+
vsphere
1701+
password
16661702
|The password for the vCenter user name.
16671703
|String
16681704

1669-
|`platform.vsphere.resourcePool`
1705+
l|platform
1706+
vsphere
1707+
resourcePool
16701708
|Optional. The absolute path of an existing resource pool where the installation program creates the virtual machines. If you do not specify a value, the installation program installs the resources in the root of the cluster under `/<datacenter_name>/host/<cluster_name>/Resources`.
1671-
|String, for example, `/<datacenter_name>/host/<cluster_name>/Resources/<resource_pool_name>/<optional_nested_resource_pool_name>`.
1709+
a|String, for example, `/<datacenter_name>/host/<cluster_name>/Resources/<resource_pool_name>/<optional_nested_resource_pool_name>`.
16721710

1673-
|`platform.vsphere.username`
1711+
l|platform
1712+
vsphere
1713+
username
16741714
|The user name to use to connect to the vCenter instance with. This user must have at least
16751715
the roles and privileges that are required for
16761716
link:https://github.com/vmware-archive/vsphere-storage-for-kubernetes/blob/master/documentation/vcp-roles.md[static or dynamic persistent volume provisioning]
16771717
in vSphere.
16781718
|String
16791719

1680-
|`platform.vsphere.vCenter`
1720+
l|platform
1721+
vsphere
1722+
vCenter
16811723
|The fully-qualified hostname or IP address of a vCenter server.
16821724
|String
16831725
|====
16841726

1685-
16861727
[id="installation-configuration-parameters-optional-vsphere_{context}"]
16871728
== Optional VMware vSphere machine pool configuration parameters
16881729

16891730
Optional VMware vSphere machine pool configuration parameters are described in the following table:
16901731

16911732
.Optional VMware vSphere machine pool parameters
1692-
[cols=".^2,.^3a,.^3a",options="header"]
1733+
[cols=".^2a,.^3a,.^3a",options="header"]
16931734
|====
16941735
|Parameter|Description|Values
16951736

1696-
|`platform.vsphere.clusterOSImage`
1737+
l|platform
1738+
vsphere
1739+
clusterOSImage
16971740
|The location from which the installation program downloads the {op-system-first} image. Before setting a path value for this parameter, ensure that the {op-system} image's version matches the version of {op-system} that you installed on your {product-title} cluster.
16981741
|An HTTP or HTTPS URL, optionally with a SHA-256 checksum. For example, `\https://mirror.openshift.com/images/rhcos-<version>-vmware.<architecture>.ova`.
16991742

1700-
|`platform.vsphere.osDisk.diskSizeGB`
1743+
l|platform
1744+
vsphere
1745+
osDisk
1746+
diskSizeGB
17011747
|The size of the disk in gigabytes.
17021748
|Integer
17031749

1704-
|`platform.vsphere.cpus`
1750+
l|platform
1751+
vsphere
1752+
cpus
17051753
|The total number of virtual processor cores to assign a virtual machine. The value of `platform.vsphere.cpus` must be a multiple of `platform.vsphere.coresPerSocket` value.
17061754
|Integer
17071755

1708-
|`platform.vsphere.coresPerSocket`
1756+
l|platform
1757+
vsphere
1758+
coresPerSocket
17091759
|The number of cores per socket in a virtual machine. The number of virtual sockets on the virtual machine is `platform.vsphere.cpus`/`platform.vsphere.coresPerSocket`. The default value for control plane nodes and worker nodes is `4` and `2`, respectively.
17101760
|Integer
17111761

1712-
|`platform.vsphere.memoryMB`
1762+
l|platform
1763+
vsphere
1764+
memoryMB
17131765
|The size of a virtual machine's memory in megabytes.
17141766
|Integer
17151767
|====

modules/installation-initializing-manual.adoc

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ifeval::["{context}" == "installing-azure-stack-hub-user-infra"]
2626
:ash:
2727
endif::[]
2828
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
29-
:restricted:
29+
:restricted-upi:
3030
endif::[]
3131
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
3232
:restricted:
@@ -65,7 +65,10 @@ ifeval::["{context}" == "installing-ibm-power-vs-private-cluster"]
6565
:ibm-power-vs-private:
6666
endif::[]
6767
ifeval::["{context}" == "installing-vsphere"]
68-
:three-node-cluster:
68+
:vsphere-upi-vsphere:
69+
endif::[]
70+
ifeval::["{context}" == "installing-vsphere-network-customizations"]
71+
:vsphere-upi:
6972
endif::[]
7073

7174
:_content-type: PROCEDURE
@@ -75,6 +78,14 @@ endif::[]
7578
ifndef::aws-china,aws-gov,aws-secret,azure-gov,ash,aws-private,azure-private,gcp-private,gcp-shared,ash-default,ash-network,ibm-cloud-private,ibm-power-vs-private[]
7679
For user-provisioned installations of {product-title}, you manually generate your installation configuration file.
7780
endif::aws-china,aws-gov,aws-secret,azure-gov,ash,aws-private,azure-private,gcp-private,gcp-shared,ash-default,ash-network,ibm-cloud-private,ibm-power-vs-private[]
81+
ifdef::vsphere-upi,restricted-upi[]
82+
For user-provisioned installations of {product-title}, you manually generate your installation configuration file.
83+
84+
[IMPORTANT]
85+
====
86+
The Cluster Cloud Controller Manager Operator performs a connectivity check on a provided hostname or IP address. Ensure that you specify a hostname or an IP address to a reachable vCenter server. If you provide metadata to a non-existent vCenter server, installation of the cluster fails at the bootstrap stage.
87+
====
88+
endif::vsphere-upi,restricted-upi[]
7889
ifdef::aws-china,aws-gov,aws-secret[]
7990
Installing the cluster requires that you manually generate the installation configuration file.
8091
//Made this update as part of feedback in PR3961. tl;dr Simply state you have to create the config file, instead of creating a number of conditions to explain why.
@@ -101,11 +112,11 @@ endif::aws-china,aws-secret[]
101112
* You have an SSH public key on your local machine to provide to the installation program. The key will be used for SSH authentication onto your cluster nodes for debugging and disaster recovery.
102113
* You have obtained the {product-title} installation program and the pull secret for your
103114
cluster.
104-
ifdef::restricted[]
115+
ifdef::restricted,restricted-upi[]
105116
* Obtain the `imageContentSources` section from the output of the command to
106117
mirror the repository.
107118
* Obtain the contents of the certificate for your mirror registry.
108-
endif::restricted[]
119+
endif::restricted,restricted-upi[]
109120

110121
.Procedure
111122

@@ -133,14 +144,14 @@ it in the `<installation_directory>`.
133144
====
134145
You must name this configuration file `install-config.yaml`.
135146
====
136-
ifdef::restricted[]
147+
ifdef::restricted,restricted-upi[]
137148
** Unless you use a registry that {op-system} trusts by default, such as
138149
`docker.io`, you must provide the contents of the certificate for your mirror
139150
repository in the `additionalTrustBundle` section. In most cases, you must
140151
provide the certificate for your mirror.
141152
** You must include the `imageContentSources` section from the output of the command to
142153
mirror the repository.
143-
endif::restricted[]
154+
endif::restricted,restricted-upi[]
144155
+
145156

146157
ifndef::aws-china,aws-gov,aws-secret,azure-gov,ash,ash-default,ash-network,gcp-shared,ibm-cloud-private,ibm-power-vs-private[]
@@ -197,9 +208,9 @@ Make the following modifications:
197208
For more information about the parameters, see "Installation configuration parameters".
198209
endif::ash-default,ash-network[]
199210

200-
ifdef::three-node-cluster[]
211+
ifdef::vsphere-upi-vsphere[]
201212
. If you are installing a three-node cluster, modify the `install-config.yaml` file by setting the `compute.replicas` parameter to `0`. This ensures that the cluster's control planes are schedulable. For more information, see "Installing a three-node cluster on {platform}".
202-
endif::three-node-cluster[]
213+
endif::vsphere-upi-vsphere[]
203214

204215
. Back up the `install-config.yaml` file so that you can use it to install
205216
multiple clusters.
@@ -256,6 +267,9 @@ ifeval::["{context}" == "installing-ibm-power-vs-private-cluster"]
256267
:!ibm-power-vs-private:
257268
endif::[]
258269
ifeval::["{context}" == "installing-vsphere"]
259-
:!three-node-cluster:
270+
:vsphere-upi-vsphere:
271+
endif::[]
272+
ifeval::["{context}" == "installing-vsphere-network-customizations"]
273+
:vsphere-upi:
260274
endif::[]
261275
:!platform:

modules/installation-vsphere-config-yaml.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ If you must specify VMs across multiple datastores, use a `datastore` object to
165165
<11> 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 and you do not want to use the default `StorageClass` object, named `thin`, you can omit the `folder` parameter from the `install-config.yaml` file.
166166
<12> The password associated with the vSphere user.
167167
<13> The fully-qualified hostname or IP address of the vCenter server.
168+
+
169+
[IMPORTANT]
170+
====
171+
The Cluster Cloud Controller Manager Operator performs a connectivity check on a provided hostname or IP address. Ensure that you specify a hostname or an IP address to a reachable vCenter server. If you provide metadata to a non-existent vCenter server, installation of the cluster fails at the bootstrap stage.
172+
====
168173
<14> The vSphere disk provisioning method.
169174
ifndef::openshift-origin[]
170175
<15> 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.

0 commit comments

Comments
 (0)