Skip to content

Commit fd7a5e8

Browse files
dfitzmauopenshift-cherrypick-robot
authored andcommitted
OSDOCS-14020: Updated IPI/UPI vSphere vCenter data center explanations
1 parent 04d8157 commit fd7a5e8

File tree

2 files changed

+40
-7
lines changed

2 files changed

+40
-7
lines changed

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

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
// * installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
55

66
// Note: The ifndef statements add content to IPI documents
7+
ifeval::["{context}" == "ipi-vsphere-installation-reqs"]
8+
:ipi:
9+
endif::[]
710
ifeval::["{context}" == "upi-vsphere-installation-reqs"]
811
:upi:
912
endif::[]
@@ -130,7 +133,12 @@ endif::upi[]
130133
`VirtualMachine.Provisioning.DeployTemplate`
131134
132135
|vSphere vCenter data center
133-
|If the installation program creates the virtual machine folder. For user-provisioned infrastructure, `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.
136+
ifdef::ipi[]
137+
|The installation program creates the virtual machine folder.
138+
endif::ipi[]
139+
ifdef::upi[]
140+
|`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.
141+
endif::upi[]
134142
|
135143
[%hardbreaks]
136144
`InventoryService.Tagging.ObjectAttachable`
@@ -260,7 +268,12 @@ endif::upi[]
260268
`"Virtual machine".Provisioning."Deploy template"`
261269
262270
|vSphere vCenter data center
263-
|If the installation program creates the virtual machine folder. For user-provisioned infrastructure, `VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API.
271+
ifdef::ipi[]
272+
|The installation program creates the virtual machine folder.
273+
endif::ipi[]
274+
ifdef::upi[]
275+
|`VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API.
276+
endif::upi[]
264277
|
265278
[%hardbreaks]
266279
`"vSphere Tagging"."Assign or Unassign vSphere Tag on Object"`
@@ -315,6 +328,7 @@ Additionally, the user requires some `ReadOnly` permissions, and some of the rol
315328
|False
316329
|Listed required privileges
317330
331+
ifdef::ipi[]
318332
.2+|vSphere vCenter data center
319333
|Existing folder
320334
|False
@@ -323,6 +337,7 @@ Additionally, the user requires some `ReadOnly` permissions, and some of the rol
323337
|Installation program creates the folder
324338
|True
325339
|Listed required privileges
340+
endif::ipi[]
326341
327342
.2+|vSphere vCenter Cluster
328343
|Existing resource pool
@@ -475,7 +490,7 @@ ifndef::upi[]
475490
`VirtualMachine.Provisioning.DeployTemplate`
476491
477492
|vSphere vCenter data center
478-
|If the installation program creates the virtual machine folder. For user-provisioned infrastructure, `VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API. If your cluster does use the Machine API and you want to set the minimum set of permissions for the API, see the "Minimum permissions for the Machine API" table.
493+
|If the virtual machine folder does not already exist, the installation program creates the virtual machine folder. If your cluster does use the Machine API and you want to set the minimum set of permissions for the API, see the "Minimum permissions for the Machine API" table.
479494
|
480495
[%hardbreaks]
481496
`Folder.Create`
@@ -587,7 +602,12 @@ endif::upi[]
587602
`VirtualMachine.Provisioning.DeployTemplate`
588603
589604
|vSphere vCenter data center
590-
|If the installation program creates the virtual machine folder. For user-provisioned infrastructure, `VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API. If your cluster does use the Machine API and you want to set the minimum set of permissions for the API, see the "Minimum permissions for the Machine API" table.
605+
ifdef::ipi[]
606+
|If the virtual machine folder does not already exist, the installation program creates the virtual machine folder.
607+
endif::ipi[]
608+
ifdef::upi[]
609+
|`VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API. If your cluster does use the Machine API and you want to set the minimum set of permissions for the API, see the "Minimum permissions for the Machine API" table.
610+
endif::upi[]
591611
|
592612
[%hardbreaks]
593613
`Resource.AssignVMToPool`
@@ -655,7 +675,12 @@ endif::upi[]
655675
`VirtualMachine.Config.AddRemoveDevice`
656676
657677
|vSphere vCenter data center
658-
|If the installation program creates the virtual machine folder. For user-provisioned infrastructure, `VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API. If your cluster does use the Machine API and you want to set the minimum set of permissions for the API, see the "Minimum permissions for the Machine API" table.
678+
ifdef::ipi[]
679+
|If the virtual machine folder does not already exist, the installation program creates the virtual machine folder.
680+
endif::ipi[]
681+
ifdef::upi[]
682+
|`VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API. If your cluster does use the Machine API and you want to set the minimum set of permissions for the API, see the "Minimum permissions for the Machine API" table.
683+
endif::upi[]
659684
|
660685
[%hardbreaks]
661686
`VirtualMachine.Config.AddExistingDisk`
@@ -732,7 +757,12 @@ endif::upi[]
732757
`VirtualMachine.Provisioning.DeployTemplate`
733758
734759
|vSphere vCenter data center
735-
|If the installation program creates the virtual machine folder. For user-provisioned infrastructure, `VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API.
760+
ifdef::ipi[]
761+
|If the virtual machine folder does not already exist, the installation program creates the virtual machine folder.
762+
endif::ipi[]
763+
ifdef::upi[]
764+
|`VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API.
765+
endif::upi[]
736766
|
737767
[%hardbreaks]
738768
`Resource.AssignVMToPool`
@@ -863,6 +893,9 @@ default. This record must be resolvable by both clients external to the cluster
863893
and from all the nodes within the cluster.
864894
|===
865895

896+
ifeval::["{context}" == "ipi-vsphere-installation-reqs"]
897+
:!ipi:
898+
endif::[]
866899
ifeval::["{context}" == "upi-vsphere-installation-reqs"]
867900
:!upi:
868901
endif::[]

modules/machineset-vsphere-required-permissions.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ If you cannot use an account with global administrative privileges, you must cre
6868
`VirtualMachine.Provisioning.Clone`
6969
7070
|vSphere vCenter data center
71-
|If the installation program creates the virtual machine folder
71+
|If the installation program creates the virtual machine folder.
7272
|
7373
[%hardbreaks]
7474
`Resource.AssignVMToPool`

0 commit comments

Comments
 (0)