Skip to content

Commit b139ff4

Browse files
committed
replaces instances of VMware datacenter with two words
1 parent 8035b61 commit b139ff4

22 files changed

+119
-119
lines changed

modules/capi-yaml-machine-set-vsphere.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ spec:
4040
zone: <zone_a>
4141
server: <vcenter_server_name>
4242
topology:
43-
datacenter: <region_a_datacenter>
44-
computeCluster: "</region_a_datacenter/host/zone_a_cluster>"
45-
resourcePool: "</region_a_datacenter/host/zone_a_cluster/Resources/resource_pool>"
46-
datastore: "</region_a_datacenter/datastore/datastore_a>"
43+
datacenter: <region_a_data_center>
44+
computeCluster: "</region_a_data_center/host/zone_a_cluster>"
45+
resourcePool: "</region_a_data_center/host/zone_a_cluster/Resources/resource_pool>"
46+
datastore: "</region_a_data_center/datastore/datastore_a>"
4747
networks:
4848
- port-group
4949
----

modules/capi-yaml-machine-template-vsphere.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
server: <vcenter_server_ip> # <5>
2424
diskGiB: 128
2525
cloneMode: linkedClone # <6>
26-
datacenter: <vcenter_datacenter_name> # <7>
26+
datacenter: <vcenter_data_center_name> # <7>
2727
datastore: <vcenter_datastore_name> # <8>
2828
folder: <vcenter_vm_folder_path> # <9>
2929
resourcePool: <vsphere_resource_pool> # <10>
@@ -51,8 +51,8 @@ The following values are valid:
5151
+
5252
When using the `linkedClone` type, the disk size matches the clone source instead of using the `diskGiB` value.
5353
For more information, see the {vmw-short} documentation about VM clone types.
54-
<7> Specify the vCenter Datacenter to deploy the compute machine set on.
55-
<8> Specify the vCenter Datastore to deploy the compute machine set on.
54+
<7> Specify the vCenter data center to deploy the compute machine set on.
55+
<8> Specify the vCenter datastore to deploy the compute machine set on.
5656
<9> Specify the path to the vSphere VM folder in vCenter, such as `/dc1/vm/user-inst-5ddjd`.
5757
<10> Specify the vSphere resource pool for your VMs.
5858
<11> Specify the vSphere VM network to deploy the compute machine set to.

modules/configuring-vsphere-regions-zones.adoc

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
:_mod-docs-content-type: PROCEDURE
1111
[id="configuring-vsphere-regions-zones_{context}"]
1212
= Configuring regions and zones for a VMware vCenter
13-
You can modify the default installation configuration file, so that you can deploy an {product-title} cluster to multiple vSphere datacenters that run in a single VMware vCenter.
13+
You can modify the default installation configuration file, so that you can deploy an {product-title} cluster to multiple vSphere data centers that run in a single VMware vCenter.
1414

1515
The default `install-config.yaml` file configuration from the previous release of {product-title} is deprecated. You can continue to use the deprecated default configuration, but the `openshift-installer` will prompt you with a warning message that indicates the use of deprecated fields in the configuration file.
1616

@@ -24,7 +24,7 @@ The example uses the `govc` command. The `govc` command is an open source comman
2424
+
2525
[IMPORTANT]
2626
====
27-
You must specify at least one failure domain for your {product-title} cluster, so that you can provision datacenter objects for your VMware vCenter server. Consider specifying multiple failure domains if you need to provision virtual machine nodes in different datacenters, clusters, datastores, and other components. To enable regions and zones, you must define multiple failure domains for your {product-title} cluster.
27+
You must specify at least one failure domain for your {product-title} cluster, so that you can provision data center objects for your VMware vCenter server. Consider specifying multiple failure domains if you need to provision virtual machine nodes in different data centers, clusters, datastores, and other components. To enable regions and zones, you must define multiple failure domains for your {product-title} cluster.
2828
====
2929
3030
.Procedure
@@ -46,7 +46,7 @@ $ govc tags.category.create -d "OpenShift region" openshift-region
4646
$ govc tags.category.create -d "OpenShift zone" openshift-zone
4747
----
4848

49-
. To create a region tag for each region vSphere datacenter where you want to deploy your cluster, enter the following command in your terminal:
49+
. To create a region tag for each region vSphere data center where you want to deploy your cluster, enter the following command in your terminal:
5050
+
5151
[source,terminal]
5252
----
@@ -60,23 +60,23 @@ $ govc tags.create -c <region_tag_category> <region_tag>
6060
$ govc tags.create -c <zone_tag_category> <zone_tag>
6161
----
6262

63-
. Attach region tags to each vCenter datacenter object by entering the following command:
63+
. Attach region tags to each vCenter data center object by entering the following command:
6464
+
6565
[source,terminal]
6666
----
67-
$ govc tags.attach -c <region_tag_category> <region_tag_1> /<datacenter_1>
67+
$ govc tags.attach -c <region_tag_category> <region_tag_1> /<data_center_1>
6868
----
6969

70-
. Attach the zone tags to each vCenter datacenter object by entering the following command:
70+
. Attach the zone tags to each vCenter data center object by entering the following command:
7171
+
7272
[source,terminal]
7373
----
74-
$ govc tags.attach -c <zone_tag_category> <zone_tag_1> /<datacenter_1>/host/vcs-mdcnc-workload-1
74+
$ govc tags.attach -c <zone_tag_category> <zone_tag_1> /<data_center_1>/host/vcs-mdcnc-workload-1
7575
----
7676

7777
. Change to the directory that contains the installation program and initialize the cluster deployment according to your chosen installation requirements.
7878

79-
.Sample `install-config.yaml` file with multiple datacenters defined in a vSphere center
79+
.Sample `install-config.yaml` file with multiple data centers defined in a vSphere center
8080

8181
[source,yaml]
8282
----
@@ -100,32 +100,32 @@ platform:
100100
vcenters:
101101
---
102102
datacenters:
103-
- <datacenter1_name>
104-
- <datacenter2_name>
103+
- <data_center_1_name>
104+
- <data_center_2_name>
105105
failureDomains:
106106
- name: <machine_pool_zone_1>
107107
region: <region_tag_1>
108108
zone: <zone_tag_1>
109109
server: <fully_qualified_domain_name>
110110
topology:
111-
datacenter: <datacenter1>
112-
computeCluster: "/<datacenter1>/host/<cluster1>"
111+
datacenter: <data_center_1>
112+
computeCluster: "/<data_center_1>/host/<cluster1>"
113113
networks:
114114
- <VM_Network1_name>
115-
datastore: "/<datacenter1>/datastore/<datastore1>"
116-
resourcePool: "/<datacenter1>/host/<cluster1>/Resources/<resourcePool1>"
117-
folder: "/<datacenter1>/vm/<folder1>"
115+
datastore: "/<data_center_1>/datastore/<datastore1>"
116+
resourcePool: "/<data_center_1>/host/<cluster1>/Resources/<resourcePool1>"
117+
folder: "/<data_center_1>/vm/<folder1>"
118118
- name: <machine_pool_zone_2>
119119
region: <region_tag_2>
120120
zone: <zone_tag_2>
121121
server: <fully_qualified_domain_name>
122122
topology:
123-
datacenter: <datacenter2>
124-
computeCluster: "/<datacenter2>/host/<cluster2>"
123+
datacenter: <data_center_2>
124+
computeCluster: "/<data_center_2>/host/<cluster2>"
125125
networks:
126126
- <VM_Network2_name>
127-
datastore: "/<datacenter2>/datastore/<datastore2>"
128-
resourcePool: "/<datacenter2>/host/<cluster2>/Resources/<resourcePool2>"
129-
folder: "/<datacenter2>/vm/<folder2>"
127+
datastore: "/<data_center_2>/datastore/<datastore2>"
128+
resourcePool: "/<data_center_2>/host/<cluster2>/Resources/<resourcePool2>"
129+
folder: "/<data_center_2>/vm/<folder2>"
130130
---
131131
----

modules/cpmso-yaml-failure-domain-vsphere.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
On {vmw-full} infrastructure, the cluster-wide infrastructure Custom Resource Definition (CRD), `infrastructures.config.openshift.io`, defines failure domains for your cluster.
1010
The `providerSpec` in the `ControlPlaneMachineSet` custom resource (CR) specifies names for failure domains that the control plane machine set uses to ensure control plane nodes are deployed to the appropriate failure domain.
11-
A failure domain is an infrastructure resource made up of a control plane machine set, a vCenter datacenter, vCenter datastore, and a network.
11+
A failure domain is an infrastructure resource made up of a control plane machine set, a vCenter data center, vCenter datastore, and a network.
1212

13-
By using a failure domain resource, you can use a control plane machine set to deploy control plane machines on separate clusters or datacenters.
13+
By using a failure domain resource, you can use a control plane machine set to deploy control plane machines on separate clusters or data centers.
1414
A control plane machine set also balances control plane machines across defined failure domains to provide fault tolerance capabilities to your infrastructure.
1515

1616
[NOTE]

modules/cpmso-yaml-provider-spec-vsphere.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
userDataSecret:
4242
name: master-user-data <9>
4343
workspace: <10>
44-
datacenter: <vcenter_datacenter_name> <11>
44+
datacenter: <vcenter_data_center_name> <11>
4545
datastore: <vcenter_datastore_name> <12>
4646
folder: <path_to_vcenter_vm_folder> <13>
4747
resourcePool: <vsphere_resource_pool> <14>
@@ -69,8 +69,8 @@ If you specify this value in the provider specification when using failure domai
6969
If the cluster is configured to use a failure domain, these parameters are configured in the failure domain.
7070
If you specify these values in the provider specification when using failure domains, the Control Plane Machine Set Operator ignores them.
7171
====
72-
<11> Specifies the vCenter Datacenter for the control plane.
73-
<12> Specifies the vCenter Datastore for the control plane.
72+
<11> Specifies the vCenter data center for the control plane.
73+
<12> Specifies the vCenter datastore for the control plane.
7474
<13> Specifies the path to the vSphere VM folder in vCenter, such as `/dc1/vm/user-inst-5ddjd`.
7575
<14> Specifies the vSphere resource pool for your VMs.
7676
<15> Specifies the vCenter server IP or fully qualified domain name.

modules/images-configuration-registry-mirror.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Setting up repository mirroring can be done in the following ways:
2525

2626
* At {product-title} installation:
2727
+
28-
By pulling container images needed by {product-title} and then bringing those images behind your company's firewall, you can install {product-title} into a datacenter that is in a disconnected environment.
28+
By pulling container images needed by {product-title} and then bringing those images behind your company's firewall, you can install {product-title} into a data center that is in a disconnected environment.
2929
3030
* After {product-title} installation:
3131
+
@@ -53,6 +53,6 @@ requested from the source repository.
5353

5454
For new clusters, you can use IDMS, ITMS, and ICSP CRs objects as desired. However, using IDMS and ITMS is recommended.
5555

56-
If you upgraded a cluster, any existing ICSP objects remain stable, and both IDMS and ICSP objects are supported. Workloads using ICSP objects continue to function as expected. However, if you want to take advantage of the fallback policies introduced in the IDMS CRs, you can migrate current workloads to IDMS objects by using the `oc adm migrate icsp` command as shown in the *Converting ImageContentSourcePolicy (ICSP) files for image registry repository mirroring* section that follows. Migrating to IDMS objects does not require a cluster reboot.
56+
If you upgraded a cluster, any existing ICSP objects remain stable, and both IDMS and ICSP objects are supported. Workloads using ICSP objects continue to function as expected. However, if you want to take advantage of the fallback policies introduced in the IDMS CRs, you can migrate current workloads to IDMS objects by using the `oc adm migrate icsp` command as shown in the *Converting ImageContentSourcePolicy (ICSP) files for image registry repository mirroring* section that follows. Migrating to IDMS objects does not require a cluster reboot.
5757

5858
include::snippets/idms-global-pull-secret.adoc[]

modules/installation-configuration-parameters.adoc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2692,7 +2692,7 @@ endif::vsphere[]
26922692
vsphere:
26932693
failureDomains:
26942694
region:
2695-
|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.
2695+
|If you define multiple failure domains for your cluster, you must attach the tag to each vCenter data center. To define a region, use a tag from the `openshift-region` tag category. For a single vSphere data center environment, you do not need to attach a tag, but you must enter an alphanumeric value, such as `datacenter`, for the parameter.
26962696
|String
26972697

26982698
|platform:
@@ -2706,7 +2706,7 @@ endif::vsphere[]
27062706
vsphere:
27072707
failureDomains:
27082708
zone:
2709-
|If you define multiple failure domains for your cluster, you must attach a 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.
2709+
|If you define multiple failure domains for your cluster, you must attach a tag to each vCenter cluster. To define a zone, use a tag from the `openshift-zone` tag category. For a single vSphere data center environment, you do not need to attach a tag, but you must enter an alphanumeric value, such as `cluster`, for the parameter.
27102710
|String
27112711

27122712
|platform:
@@ -2722,8 +2722,8 @@ endif::vsphere[]
27222722
failureDomains:
27232723
topology:
27242724
datacenter:
2725-
|Lists and defines the datacenters where {product-title} virtual machines (VMs) operate.
2726-
The list of datacenters must match the list of datacenters specified in the `vcenters` field.
2725+
|Lists and defines the data centers where {product-title} virtual machines (VMs) operate.
2726+
The list of data centers must match the list of data centers specified in the `vcenters` field.
27272727
|String
27282728

27292729
ifdef::vsphere[]
@@ -2758,9 +2758,9 @@ endif::agent[]
27582758
failureDomains:
27592759
topology:
27602760
folder:
2761-
|Optional: The absolute path of an existing folder where the user creates the virtual machines, for example, `/<datacenter_name>/vm/<folder_name>/<subfolder_name>`.
2761+
|Optional: The absolute path of an existing folder where the user creates the virtual machines, for example, `/<data_center_name>/vm/<folder_name>/<subfolder_name>`.
27622762
ifdef::vsphere[]
2763-
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.
2763+
If you do not provide this value, the installation program creates a top-level folder in the data center 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.
27642764
endif::vsphere[]
27652765
|String
27662766

@@ -2778,9 +2778,9 @@ endif::vsphere[]
27782778
topology:
27792779
resourcePool:
27802780

2781-
|Optional: The absolute path of an existing resource pool where the installation program creates the virtual machines, for example, `/<datacenter_name>/host/<cluster_name>/Resources/<resource_pool_name>/<optional_nested_resource_pool_name>`.
2781+
|Optional: The absolute path of an existing resource pool where the installation program creates the virtual machines, for example, `/<data_center_name>/host/<cluster_name>/Resources/<resource_pool_name>/<optional_nested_resource_pool_name>`.
27822782
ifdef::vsphere[]
2783-
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`.
2783+
If you do not specify a value, the installation program installs the resources in the root of the cluster under `/<data_center_name>/host/<cluster_name>/Resources`.
27842784
endif::vsphere[]
27852785
|String
27862786

@@ -2814,7 +2814,7 @@ endif::vsphere[]
28142814
vsphere:
28152815
vcenters:
28162816
datacenters:
2817-
|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.
2817+
|Lists and defines the data centers where {product-title} virtual machines (VMs) operate. The list of data centers must match the list of data centers specified in the `failureDomains` field.
28182818
|String
28192819

28202820
|platform:
@@ -2880,7 +2880,7 @@ endif::vsphere[]
28802880
|platform:
28812881
vsphere:
28822882
datacenter:
2883-
|Defines the datacenter where {product-title} virtual machines (VMs) operate.
2883+
|Defines the data center where {product-title} virtual machines (VMs) operate.
28842884
|String
28852885

28862886
|platform:
@@ -2893,7 +2893,7 @@ endif::vsphere[]
28932893
vsphere:
28942894
folder:
28952895
|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.
2896-
|String, for example, `/<datacenter_name>/vm/<folder_name>/<subfolder_name>`.
2896+
|String, for example, `/<data_center_name>/vm/<folder_name>/<subfolder_name>`.
28972897

28982898
ifdef::vsphere[]
28992899
|platform:
@@ -2922,8 +2922,8 @@ endif::vsphere[]
29222922
|platform:
29232923
vsphere:
29242924
resourcePool:
2925-
|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`.
2926-
|String, for example, `/<datacenter_name>/host/<cluster_name>/Resources/<resource_pool_name>/<optional_nested_resource_pool_name>`.
2925+
|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 `/<data_center_name>/host/<cluster_name>/Resources`.
2926+
|String, for example, `/<data_center_name>/host/<cluster_name>/Resources/<resource_pool_name>/<optional_nested_resource_pool_name>`.
29272927

29282928
|platform:
29292929
vsphere:

modules/installation-initializing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ The installation program connects to your vCenter instance.
333333
+
334334
[NOTE]
335335
====
336-
After you create the installation configuration file, you can modify the file to create a multiple vSphere datacenters environment. This means that you can deploy an {product-title} cluster to multiple vSphere datacenters that run in a single VMware vCenter. For more information about creating this environment, see the section named _VMware vSphere region and zone enablement_.
336+
After you create the installation configuration file, you can modify the file to create a multiple vSphere data center environment. This means that you can deploy an {product-title} cluster to multiple vSphere data centers that run in a single VMware vCenter. For more information about creating this environment, see the section named _VMware vSphere region and zone enablement_.
337337
====
338338

339339
... Select the default vCenter datastore to use.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@ platform:
5555
region: <default_region_name>
5656
server: <fully_qualified_domain_name>
5757
topology:
58-
computeCluster: "/<datacenter>/host/<cluster>"
59-
datacenter: <datacenter>
60-
datastore: "/<datacenter>/datastore/<datastore>" <6>
58+
computeCluster: "/<data_center>/host/<cluster>"
59+
datacenter: <data_center>
60+
datastore: "/<data_center>/datastore/<datastore>" <6>
6161
networks:
6262
- <VM_Network_name>
63-
resourcePool: "/<datacenter>/host/<cluster>/Resources/<resourcePool>" <7>
64-
folder: "/<datacenter_name>/vm/<folder_name>/<subfolder_name>"
63+
resourcePool: "/<data_center>/host/<cluster>/Resources/<resourcePool>" <7>
64+
folder: "/<data_center_name>/vm/<folder_name>/<subfolder_name>"
6565
tagIDs: <8>
6666
- <tag_id> <9>
6767
zone: <default_zone_name>
6868
ingressVIPs:
6969
- 10.0.0.2
7070
vcenters:
7171
- datacenters:
72-
- <datacenter>
72+
- <data_center>
7373
password: <password>
7474
port: 443
7575
server: <fully_qualified_domain_name>

0 commit comments

Comments
 (0)