Skip to content

Commit 48c1798

Browse files
authored
Merge pull request #70551 from skopacz1/OSDOCS-9001
OSDOCS#9001: Adding vSphere credentials to Agent
2 parents 3e753bf + 71c0210 commit 48c1798

File tree

3 files changed

+145
-3
lines changed

3 files changed

+145
-3
lines changed

installing/installing_with_agent_based_installer/installation-config-parameters-agent.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
1414
[role="_additional-resources"]
1515
.Additional resources
1616
* xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#bmc-addressing_ipi-install-installation-workflow[BMC addressing]
17+
* xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#configuring-vsphere-regions-zones_installing-vsphere-installer-provisioned-customizations[Configuring regions and zones for a VMware vCenter]
1718
1819
include::modules/agent-configuration-parameters.adoc[leveloffset=+1]
1920

installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ include::modules/installing-ocp-agent-download.adoc[leveloffset=+2]
2828
// Creating the preferred configuration inputs
2929
include::modules/installing-ocp-agent-inputs.adoc[leveloffset=+2]
3030

31+
[role="_additional-resources"]
32+
.Additional resources
33+
* xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#configuring-vsphere-regions-zones_installing-vsphere-installer-provisioned-customizations[Configuring regions and zones for a VMware vCenter]
34+
3135
[id="installing-ocp-agent-opt-manifests_{context}"]
3236
=== Optional: Creating additional manifest files
3337

modules/installation-configuration-parameters.adoc

Lines changed: 140 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2636,17 +2636,24 @@ Valid names include:
26362636
--
26372637
endif::ibm-cloud[]
26382638

2639-
ifdef::vsphere[]
2640-
2639+
ifdef::agent,vsphere[]
26412640
[id="installation-configuration-parameters-additional-vsphere_{context}"]
26422641
== Additional VMware vSphere configuration parameters
26432642

26442643
Additional VMware vSphere configuration parameters are described in the following table:
26452644

26462645
.Additional VMware vSphere cluster parameters
2647-
[cols=".^2l,.^4,.^2",options="header,word-wrap",subs="+quotes,+attributes"]
2646+
[cols=".^2l,.^3a,.^3",options="header,word-wrap",subs="+quotes,+attributes"]
26482647
|====
26492648
|Parameter|Description|Values
2649+
ifdef::agent[]
2650+
2651+
|platform:
2652+
vsphere:
2653+
| Describes your account on the cloud platform that hosts your cluster. You can use the parameter to customize the platform. If you provide additional configuration settings for compute and control plane machines in the machine pool, the parameter is not required. You can only specify one vCenter server for your {product-title} cluster.
2654+
|A dictionary of vSphere configuration objects
2655+
endif::agent[]
2656+
ifdef::vsphere[]
26502657

26512658
|platform:
26522659
vsphere:
@@ -2667,6 +2674,29 @@ Additional VMware vSphere configuration parameters are described in the followin
26672674
failureDomains:
26682675
|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.
26692676
|String
2677+
endif::vsphere[]
2678+
ifdef::agent[]
2679+
2680+
|platform:
2681+
vsphere:
2682+
failureDomains:
2683+
|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.
2684+
|An array of failure domain configuration objects.
2685+
2686+
|platform:
2687+
vsphere:
2688+
failureDomains:
2689+
name:
2690+
|The name of the failure domain.
2691+
|String
2692+
2693+
|platform:
2694+
vsphere:
2695+
failureDomains:
2696+
server:
2697+
|The fully qualified domain name (FQDN) of the vCenter server.
2698+
|An FQDN such as example.com
2699+
endif::agent[]
26702700

26712701
|platform:
26722702
vsphere:
@@ -2675,6 +2705,65 @@ Additional VMware vSphere configuration parameters are described in the followin
26752705
networks:
26762706
|Lists any network in the vCenter instance that contains the virtual IP addresses and DNS records that you configured.
26772707
|String
2708+
ifdef::agent[]
2709+
2710+
|platform:
2711+
vsphere:
2712+
failureDomains:
2713+
topology:
2714+
computeCluster:
2715+
|The path to the vSphere compute cluster.
2716+
|String
2717+
2718+
|platform:
2719+
vsphere:
2720+
failureDomains:
2721+
topology:
2722+
datacenter:
2723+
|Lists and defines the datacenters where {product-title} virtual machines (VMs) operate.
2724+
The list of datacenters must match the list of datacenters specified in the `vcenters` field.
2725+
|String
2726+
2727+
|platform:
2728+
vsphere:
2729+
failureDomains:
2730+
topology:
2731+
datastore:
2732+
|The path to the vSphere datastore that holds virtual machine files, templates, and ISO images.
2733+
[IMPORTANT]
2734+
====
2735+
You can specify the path of any datastore that exists in a datastore cluster.
2736+
By default, Storage vMotion is automatically enabled for a datastore cluster.
2737+
Red{nbsp}Hat does not support Storage vMotion, so you must disable Storage vMotion to avoid data loss issues for your {product-title} cluster.
2738+
2739+
If you must specify VMs across multiple datastores, use a `datastore` object to specify a failure domain in your cluster's `install-config.yaml` configuration file.
2740+
For more information, see "VMware vSphere region and zone enablement".
2741+
====
2742+
|String
2743+
2744+
|platform:
2745+
vsphere:
2746+
failureDomains:
2747+
topology:
2748+
resourcePool:
2749+
// When this content is added to vSphere docs, the line below should likely say "where the installation program creates the virtual machines".
2750+
|Optional: The absolute path of an existing resource pool where the user creates the virtual machines, for example, `/<datacenter_name>/host/<cluster_name>/Resources/<resource_pool_name>/<optional_nested_resource_pool_name>`.
2751+
// Commenting out the line below because it doesn't apply to Agent, but it may be needed when this content is brought into the regular vSphere docs.
2752+
// If you do not specify a value, resources are installed in the root of the cluster, for example `/example_datacenter/host/example_cluster/Resources`.
2753+
|String
2754+
2755+
|platform:
2756+
vsphere:
2757+
failureDomains:
2758+
topology:
2759+
folder:
2760+
// When this content is added to vSphere docs, the line below should likely say "where the installation program creates the virtual machines", and should be Optional.
2761+
|The absolute path of an existing folder where the user creates the virtual machines, for example, `/<datacenter_name>/vm/<folder_name>/<subfolder_name>`.
2762+
// Commenting out the two lines below because they don't apply to Agent, but they may be needed when this content is brought into the regular vSphere docs.
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.
2764+
// 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.
2765+
|String
2766+
endif::agent[]
26782767

26792768
|platform:
26802769
vsphere:
@@ -2696,6 +2785,7 @@ Additional VMware vSphere configuration parameters are described in the followin
26962785
template:
26972786
|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.
26982787
|String
2788+
ifdef::vsphere[]
26992789

27002790
|platform:
27012791
vsphere:
@@ -2715,13 +2805,53 @@ Additional VMware vSphere configuration parameters are described in the followin
27152805
vcenters:
27162806
|Lists any fully-qualified hostname or IP address of a vCenter server.
27172807
|String
2808+
endif::vsphere[]
2809+
ifdef::agent[]
2810+
2811+
|platform:
2812+
vsphere:
2813+
vcenters:
2814+
|Configures the connection details so that services can communicate with vCenter.
2815+
Currently, only a single vCenter is supported.
2816+
|An array of vCenter configuration objects.
2817+
endif::agent[]
27182818

27192819
|platform:
27202820
vsphere:
27212821
vcenters:
27222822
datacenters:
27232823
|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.
27242824
|String
2825+
ifdef::agent[]
2826+
2827+
|platform:
2828+
vsphere:
2829+
vcenters:
2830+
password:
2831+
|The password associated with the vSphere user.
2832+
|String
2833+
2834+
|platform:
2835+
vsphere:
2836+
vcenters:
2837+
port:
2838+
|The port number used to communicate with the vCenter server.
2839+
|Integer
2840+
2841+
|platform:
2842+
vsphere:
2843+
vcenters:
2844+
server:
2845+
|The fully qualified host name (FQHN) or IP address of the vCenter server.
2846+
|String
2847+
2848+
|platform:
2849+
vsphere:
2850+
vcenters:
2851+
user:
2852+
|The username associated with the vSphere user.
2853+
|String
2854+
endif::agent[]
27252855
|====
27262856

27272857
[id="deprecated-parameters-vsphere_{context}"]
@@ -2735,6 +2865,7 @@ The following table lists each deprecated vSphere configuration parameter:
27352865
[cols=".^2l,.^4,.^2",options="header,word-wrap",subs="+quotes,+attributes"]
27362866
|====
27372867
|Parameter|Description|Values
2868+
ifdef::vsphere[]
27382869

27392870
|platform:
27402871
vsphere:
@@ -2743,6 +2874,7 @@ The following table lists each deprecated vSphere configuration parameter:
27432874

27442875
*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.
27452876
a|An IP address, for example `128.0.0.1`.
2877+
endif::vsphere[]
27462878

27472879
|platform:
27482880
vsphere:
@@ -2768,6 +2900,8 @@ a|An IP address, for example `128.0.0.1`.
27682900
|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.
27692901
|String, for example, `/<datacenter_name>/vm/<folder_name>/<subfolder_name>`.
27702902

2903+
ifdef::vsphere[]
2904+
27712905
|platform:
27722906
vsphere:
27732907
ingressVIP:
@@ -2781,6 +2915,7 @@ a|An IP address, for example `128.0.0.1`.
27812915
network:
27822916
|The network in the vCenter instance that contains the virtual IP addresses and DNS records that you configured.
27832917
|String
2918+
endif::vsphere[]
27842919

27852920
|platform:
27862921
vsphere:
@@ -2810,6 +2945,7 @@ in vSphere.
28102945
|String
28112946
|====
28122947

2948+
ifdef::vsphere[]
28132949
[id="installation-configuration-parameters-optional-vsphere_{context}"]
28142950
== Optional VMware vSphere machine pool configuration parameters
28152951

@@ -2852,6 +2988,7 @@ Optional VMware vSphere machine pool configuration parameters are described in t
28522988
|Integer
28532989
|====
28542990
endif::vsphere[]
2991+
endif::agent,vsphere[]
28552992

28562993
ifdef::ash[]
28572994
[id="installation-configuration-parameters-additional-azure-stack-hub_{context}"]

0 commit comments

Comments
 (0)