Skip to content

Commit fd5d9a3

Browse files
authored
Merge pull request #96881 from dfitzmau/OSDOCS-14020-14
[enterprise-4.14] OSDOCS-14020-14: Updated IPI/UPI vSphere vCenter data center explanations
2 parents 8c53a41 + fd7e3b2 commit fd5d9a3

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

modules/installation-vsphere-installer-infra-requirements.adoc

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
// * installing/installing_vsphere/ipi/ipi-vsphere-installation-reqs.adoc
44
// * installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
55

6+
// Note: The ifndef statements add content to IPI documents
7+
ifeval::["{context}" == "ipi-vsphere-installation-reqs"]
8+
:ipi:
9+
endif::[]
610
ifeval::["{context}" == "upi-vsphere-installation-reqs"]
711
:upi:
812
endif::[]
@@ -127,8 +131,13 @@ endif::upi[]
127131
`VirtualMachine.Provisioning.MarkAsTemplate`
128132
`VirtualMachine.Provisioning.DeployTemplate`
129133
130-
|vSphere vCenter Datacenter
131-
|If the installation program creates the virtual machine folder. For UPI, `VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API.
134+
|vSphere vCenter data center
135+
ifdef::ipi[]
136+
|The installation program creates the virtual machine folder.
137+
endif::ipi[]
138+
ifdef::upi[]
139+
|`VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API. See the "Minimum permissions for the Machine API" table.
140+
endif::upi[]
132141
|
133142
[%hardbreaks]
134143
`InventoryService.Tagging.ObjectAttachable`
@@ -257,8 +266,13 @@ endif::upi[]
257266
`"Virtual machine".Provisioning."Mark as template"`
258267
`"Virtual machine".Provisioning."Deploy template"`
259268
260-
|vSphere vCenter Datacenter
261-
|If the installation program creates the virtual machine folder. For UPI, `VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API.
269+
|vSphere vCenter data center
270+
ifdef::ipi[]
271+
|The installation program creates the virtual machine folder.
272+
endif::ipi[]
273+
ifdef::upi[]
274+
|`VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API.
275+
endif::upi[]
262276
|
263277
[%hardbreaks]
264278
`"vSphere Tagging"."Assign or Unassign vSphere Tag on Object"`
@@ -313,14 +327,16 @@ Additionally, the user requires some `ReadOnly` permissions, and some of the rol
313327
|False
314328
|Listed required privileges
315329
316-
.2+|vSphere vCenter Datacenter
330+
ifdef::ipi[]
331+
.2+|vSphere vCenter data center
317332
|Existing folder
318333
|False
319334
|`ReadOnly` permission
320335
321336
|Installation program creates the folder
322337
|True
323338
|Listed required privileges
339+
endif::ipi[]
324340
325341
.2+|vSphere vCenter Cluster
326342
|Existing resource pool
@@ -481,6 +497,9 @@ default. This record must be resolvable by both clients external to the cluster
481497
and from all the nodes within the cluster.
482498
|===
483499

500+
ifeval::["{context}" == "ipi-vsphere-installation-reqs"]
501+
:!ipi:
502+
endif::[]
484503
ifeval::["{context}" == "upi-vsphere-installation-reqs"]
485504
:!upi:
486505
endif::[]

modules/machineset-vsphere-required-permissions.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ If you cannot use an account with global administrative privileges, you must cre
6767
`VirtualMachine.Inventory.Delete`
6868
`VirtualMachine.Provisioning.Clone`
6969
70-
|vSphere vCenter Datacenter
71-
|If the installation program creates the virtual machine folder
70+
|vSphere vCenter data center
71+
|If the installation program creates the virtual machine folder.
7272
|
7373
[%hardbreaks]
7474
`Resource.AssignVMToPool`

0 commit comments

Comments
 (0)