Merge pull request #96872 from openshift-cherrypick-robot/cherry-pick-92277-to-enterprise-4.19

[enterprise-4.19] OSDOCS-14020: Updated IPI/UPI vSphere vCenter data center explanations

Author: lahinson

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

@@ -4,6 +4,9 @@
 // * installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
 
 // Note: The ifndef statements add content to IPI documents
+ifeval::["{context}" == "ipi-vsphere-installation-reqs"]
+:ipi:
+endif::[]
 ifeval::["{context}" == "upi-vsphere-installation-reqs"]
 :upi:
 endif::[]
@@ -130,7 +133,12 @@ endif::upi[]
 `VirtualMachine.Provisioning.DeployTemplate`
 
 |vSphere vCenter data center
-|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.
+ifdef::ipi[]
+|The installation program creates the virtual machine folder.
+endif::ipi[]
+ifdef::upi[]
+|`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.
+endif::upi[]
 |
 [%hardbreaks]
 `InventoryService.Tagging.ObjectAttachable`
@@ -260,7 +268,12 @@ endif::upi[]
 `"Virtual machine".Provisioning."Deploy template"`
 
 |vSphere vCenter data center
-|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.
+ifdef::ipi[]
+|The installation program creates the virtual machine folder.
+endif::ipi[]
+ifdef::upi[]
+|`VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API.
+endif::upi[]
 |
 [%hardbreaks]
 `"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
 |False
 |Listed required privileges
 
+ifdef::ipi[]
 .2+|vSphere vCenter data center
 |Existing folder
 |False
@@ -323,6 +337,7 @@ Additionally, the user requires some `ReadOnly` permissions, and some of the rol
 |Installation program creates the folder
 |True
 |Listed required privileges
+endif::ipi[]
 
 .2+|vSphere vCenter Cluster
 |Existing resource pool
@@ -475,7 +490,7 @@ ifndef::upi[]
 `VirtualMachine.Provisioning.DeployTemplate`
 
 |vSphere vCenter data center
-|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.
+|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.
 |
 [%hardbreaks]
 `Folder.Create`
@@ -587,7 +602,12 @@ endif::upi[]
 `VirtualMachine.Provisioning.DeployTemplate`
 
 |vSphere vCenter data center
-|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.
+ifdef::ipi[]
+|If the virtual machine folder does not already exist, the installation program creates the virtual machine folder.
+endif::ipi[]
+ifdef::upi[]
+|`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.
+endif::upi[]
 |
 [%hardbreaks]
 `Resource.AssignVMToPool`
@@ -655,7 +675,12 @@ endif::upi[]
 `VirtualMachine.Config.AddRemoveDevice`
 
 |vSphere vCenter data center
-|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.
+ifdef::ipi[]
+|If the virtual machine folder does not already exist, the installation program creates the virtual machine folder.
+endif::ipi[]
+ifdef::upi[]
+|`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.
+endif::upi[]
 |
 [%hardbreaks]
 `VirtualMachine.Config.AddExistingDisk`
@@ -732,7 +757,12 @@ endif::upi[]
 `VirtualMachine.Provisioning.DeployTemplate`
 
 |vSphere vCenter data center
-|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.
+ifdef::ipi[]
+|If the virtual machine folder does not already exist, the installation program creates the virtual machine folder.
+endif::ipi[]
+ifdef::upi[]
+|`VirtualMachine.Inventory.Create` and `VirtualMachine.Inventory.Delete` privileges are optional if your cluster does not use the Machine API.
+endif::upi[]
 |
 [%hardbreaks]
 `Resource.AssignVMToPool`
@@ -863,6 +893,9 @@ default. This record must be resolvable by both clients external to the cluster
 and from all the nodes within the cluster.
 |===
 
+ifeval::["{context}" == "ipi-vsphere-installation-reqs"]
+:!ipi:
+endif::[]
 ifeval::["{context}" == "upi-vsphere-installation-reqs"]
 :!upi:
 endif::[]

modules/machineset-vsphere-required-permissions.adoc

@@ -68,7 +68,7 @@ If you cannot use an account with global administrative privileges, you must cre
 `VirtualMachine.Provisioning.Clone`
 
 |vSphere vCenter data center
-|If the installation program creates the virtual machine folder
+|If the installation program creates the virtual machine folder.
 |
 [%hardbreaks]
 `Resource.AssignVMToPool`