Merge pull request #36333 from emarcusRH/ocprhv-482A

Author: maxwelldb

modules/installation-configuration-parameters.adoc

@@ -1,6 +1,5 @@
 // Module included in the following assemblies:
 //
-// * installing/installing_aws/installing-aws-china.adoc
 // * installing/installing_aws/installing-aws-customizations.adoc
 // * installing/installing_aws/installing-aws-government-region.adoc
 // * installing/installing_aws/installing-aws-network-customizations.adoc
@@ -36,14 +35,11 @@
 // * installing/installing_ibm_power/installing-ibm-power.adoc
 // * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
 
-ifeval::["{context}" == "installing-aws-china-region"]
-:aws-china:
-endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
 endif::[]
 ifeval::["{context}" == "installing-aws-government-region"]
-:aws-gov:
+:aws:
 endif::[]
 ifeval::["{context}" == "installing-aws-network-customizations"]
 :aws:
@@ -174,25 +170,14 @@ endif::[]
 = Installation configuration parameters
 
 // If install-config.yaml is generated by openshift-install
-ifndef::bare,ibm-power,ibm-z,aws-china,aws-gov[]
+ifndef::bare,ibm-power,ibm-z[]
 Before you deploy an {product-title} cluster, you provide parameter values to describe your account on the cloud platform that hosts your cluster and optionally customize your cluster's platform. When you create the `install-config.yaml` installation configuration file, you provide values for the required parameters through the command line. If you customize your cluster, you can modify the `install-config.yaml` file to provide more details about the platform.
-endif::bare,ibm-power,ibm-z,aws-china,aws-gov[]
+endif::bare,ibm-power,ibm-z[]
 // If the user manually creates install-config.yaml
 ifdef::bare,ibm-power,ibm-z[]
 Before you deploy an {product-title} cluster, you provide a customized `install-config.yaml` installation configuration file that describes the details for your environment.
 endif::bare,ibm-power,ibm-z[]
 
-ifdef::aws-china,aws-gov[]
-Before you deploy an {product-title} cluster, modify the installation configuration file (`install-config.yaml`) to describe your environment. While there are other required parameters, you must specify:
-
-* The platform and region to which you are installing the cluster.
-* The name of the {op-system} Amazon machine image (AMI) that you created.
-
-You can find the parameters for these values under `platform`.
-
-The following tables detail the required, as well as optional, parameters.
-endif::aws-china,aws-gov[]
-
 [NOTE]
 ====
 After installation, you cannot modify these parameters in the `install-config.yaml` file.
@@ -591,7 +576,7 @@ a|For example, `sshKey: ssh-ed25519 AAAA..`.
 
 |====
 
-ifdef::aws,aws-china,aws-gov[]
+ifdef::aws[]
 [id="installation-configuration-parameters-optional-aws_{context}"]
 == Optional AWS configuration parameters
 
@@ -689,7 +674,7 @@ host must trust the certificate.
 |Valid subnet IDs.
 
 |====
-endif::aws,aws-china,aws-gov[]
+endif::aws[]
 
 ifdef::osp[]
 [id="installation-configuration-parameters-additional-osp_{context}"]
@@ -1096,7 +1081,7 @@ Additional {rh-virtualization} configuration parameters for machine pools are de
 |Optional. The VM workload type, such as `high-performance`, `server`, or `desktop`.  By default, master nodes use `high-performance`, and worker nodes use `server`. For details, see link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Virtual_Machine_General_settings_explained[Explanation of Settings in the New Virtual Machine and Edit Virtual Machine Windows] and link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Configuring_High_Performance_Virtual_Machines_Templates_and_Pools[Configuring High Performance Virtual Machines, Templates, and Pools] in the _Virtual Machine Management Guide_.
 [NOTE]
 ====
-`high_performance` improves performance on the VM, but there are limitations. For example, you cannot access the VM with a graphical console. For more information see link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Configuring_High_Performance_Virtual_Machines_Templates_and_Pools[Configuring High Performance Virtual Machines, Templates, and Pools] in the _Virtual Machine Management Guide_.
+`high_performance` improves performance on the VM, but there are limitations. For example, you cannot access the VM with a graphical console. For more information, see link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Configuring_High_Performance_Virtual_Machines_Templates_and_Pools[Configuring High Performance Virtual Machines, Templates, and Pools] in the _Virtual Machine Management Guide_.
 ====
 |String
 
@@ -1129,6 +1114,14 @@ This example defines no affinity groups:
       affinityGroupNames: []
 ----
 |String
+|`<machine-pool>.platform.ovirt.AutoPinningPolicy`
+| Optional. AutoPinningPolicy defines the policy to automatically set the CPU and NUMA settings, including pinning to the host for the instance. When the field is omitted, the default is `none`. Supported values: `none`, `resize_and_pin`. For more information, see link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Setting_NUMA_Nodes[Setting NUMA Nodes] in the _Virtual Machine Management Guide_.
+
+|String
+|`<machine-pool>.platform.ovirt.hugepages`
+|Optional. Hugepages is the size in KiB for defining hugepages in a VM. Supported values: `2048` or `1048576`. For more information, see link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Configuring_Huge_Pages[Configuring Huge Pages] in the _Virtual Machine Management Guide_.
+
+|Integer
 
 |====
 
@@ -1230,15 +1223,11 @@ endif::vsphere,vmc[]
 ifdef::bare[]
 :!bare:
 endif::bare[]
-
-ifeval::["{context}" == "installing-aws-china-region"]
-:!aws-china:
-endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :!aws:
 endif::[]
 ifeval::["{context}" == "installing-aws-government-region"]
-:!aws-gov:
+:!aws:
 endif::[]
 ifeval::["{context}" == "installing-aws-network-customizations"]
 :!aws:

modules/machineset-yaml-rhv.adoc

@@ -57,10 +57,12 @@ spec:
             name: ovirt-credentials <18>
           kind: OvirtMachineProviderSpec
           type: <workload_type> <19>
+          auto_pinning_policy: <auto_pinning_policy> <20>
+          hugepages: <hugepages> <21>
+          affinityGroupsNames:
+            - compute <22>
           userDataSecret:
             name: worker-user-data
-          affinityGroupsNames:
-            - compute <20>
 ----
 <1> Specify the infrastructure ID that is based on the cluster ID that you set when you provisioned the cluster. If you have the OpenShift CLI (`oc`) installed, you can obtain the infrastructure ID by running the following command:
 +
@@ -103,8 +105,10 @@ $ oc get -o jsonpath='{.status.infrastructureName}{"\n"}' infrastructure cluster
 
 <18> Specify the name of the secret that holds the {rh-virtualization} credentials.
 
-<19> Optional: Specify the workload type for which the instance is optimized. This value affects the `{rh-virtualization} VM` parameter. Supported values: `desktop`, `server` (default), `high_performance`. `high_performance` improves performance on the VM, but there are limitations. For example, you cannot access the VM with a graphical console. For more information see link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Configuring_High_Performance_Virtual_Machines_Templates_and_Pools[Configuring High Performance Virtual Machines, Templates, and Pools] in the _Virtual Machine Management Guide_.
-<20> A list of affinity group names that should be applied to the VMs. The affinity groups must exist in oVirt.
+<19> Optional: Specify the workload type for which the instance is optimized. This value affects the `{rh-virtualization} VM` parameter. Supported values: `desktop`, `server` (default), `high_performance`. `high_performance` improves performance on the VM, but there are limitations. For example, you cannot access the VM with a graphical console. For more information, see link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Configuring_High_Performance_Virtual_Machines_Templates_and_Pools[Configuring High Performance Virtual Machines, Templates, and Pools] in the _Virtual Machine Management Guide_.
+<20> Optional: AutoPinningPolicy defines the policy that automatically sets CPU and NUMA settings, including pinning to the host for this instance. Supported values: `none`, `resize_and_pin`. For more information, see link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Setting_NUMA_Nodes[Setting NUMA Nodes] in the _Virtual Machine Management Guide_.
+<21> Optional: Hugepages is the size in KiB for defining hugepages in a VM. Supported values: `2048` or `1048576`. For more information, see link:https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html-single/virtual_machine_management_guide/index#Configuring_Huge_Pages[Configuring Huge Pages] in the _Virtual Machine Management Guide_.
+<22> Optional: A list of affinity group names that should be applied to the VMs. The affinity groups must exist in oVirt.
 
 [NOTE]
 ====