Merge pull request #82710 from AedinC/OSDOCS-12038

OSDOCS-12038:Update steps in OSD on AWS UI to reflect current feature options

Author: abhatt-rh

modules/osd-create-cluster-ccs.adoc

@@ -146,10 +146,21 @@ To successfully create a cluster, you must select *Enable Secure Boot support fo
 +
 endif::osd-on-gcp[]
 .. Leave *Enable user workload monitoring* selected to monitor your own projects in isolation from Red Hat Site Reliability Engineer (SRE) platform metrics. This option is enabled by default.
+.. Optional: Expand *Advanced Encryption* to make changes to encryption settings.
+ifdef::osd-on-aws[]
+... Accept the default setting *Use default KMS Keys* to use your default AWS KMS key, or select *Use Custom KMS keys* to use a custom KMS key.
+.... With *Use Custom KMS keys* selected, enter the AWS Key Management Service (KMS) custom key Amazon Resource Name (ARN) ARN in the *Key ARN* field.
+The key is used for encrypting all control plane, infrastructure, worker node root volumes, and persistent volumes in your cluster.
+//Commented out due to changes in the UI
+//[IMPORTANT]
+//====
+//Only persistent volumes (PVs) created from the default storage class are encrypted with this specific key.
+//PVs created by using any other storage class are still encrypted, but the PVs are not encrypted with this key unless the storage class is specifically configured to use this key.
+//====
++
+endif::osd-on-aws[]
 ifdef::osd-on-gcp[]
-. Optional: Expand *Advanced Encryption* to make changes to encryption settings.
-
-.. Select *Use Custom KMS keys* to use custom KMS keys. If you prefer not to use custom KMS keys, leave the default setting *Use default KMS Keys*.
+... Select *Use Custom KMS keys* to use custom KMS keys. If you prefer not to use custom KMS keys, leave the default setting *Use default KMS Keys*.
 +
 [IMPORTANT]
 ====
@@ -158,41 +169,26 @@ To use custom KMS keys, the IAM service account `osd-ccs-admin` must be granted
 +
 With *Use Custom KMS keys* selected:
 
-... Select a key ring location from the *Key ring location* drop-down menu.
-... Select a key ring from the *Key ring* drop-down menu.
-... Select a key name from the *Key name* drop-down menu.
-... Provide the *KMS Service Account*.
+.... Select a key ring location from the *Key ring location* drop-down menu.
+.... Select a key ring from the *Key ring* drop-down menu.
+.... Select a key name from the *Key name* drop-down menu.
+.... Provide the *KMS Service Account*.
 +
-
-.. Optional: Select *Enable FIPS cryptography* if you require your cluster to be FIPS validated.
+endif::osd-on-gcp[]
+... Optional: Select *Enable FIPS cryptography* if you require your cluster to be FIPS validated.
 +
 [NOTE]
 ====
 If *Enable FIPS cryptography* is selected, *Enable additional etcd encryption* is enabled by default and cannot be disabled. You can select *Enable additional etcd encryption* without selecting *Enable FIPS cryptography*.
 ====
-endif::osd-on-gcp[]
-.. Optional: Select *Enable additional etcd encryption* if you require etcd key value encryption. With this option, the etcd key values are encrypted, but the keys are not. This option is in addition to the control plane storage encryption that encrypts the etcd volumes in {product-title} clusters by default.
++
+... Optional: Select *Enable additional etcd encryption* if you require etcd key value encryption. With this option, the etcd key values are encrypted, but the keys are not. This option is in addition to the control plane storage encryption that encrypts the etcd volumes in {product-title} clusters by default.
 +
 [NOTE]
 ====
 By enabling etcd encryption for the key values in etcd, you will incur a performance overhead of approximately 20%. The overhead is a result of introducing this second layer of encryption, in addition to the default control plane storage encryption that encrypts the etcd volumes. Consider enabling etcd encryption only if you specifically require it for your use case.
 ====
 +
-ifdef::osd-on-aws[]
-.. Optional: Select *Encrypt persistent volumes with customer keys* if you want to provide your own
-AWS Key Management Service (KMS) key Amazon Resource Name (ARN).
-// ifdef::osd-on-gcp[]
-// encryption keys through the Google Cloud Key Management Service.
-// endif::osd-on-gcp[]
-The key is used for encrypting all control plane, infrastructure, worker node root volumes, and persistent volumes in your cluster.
-+
-[IMPORTANT]
-====
-Only persistent volumes (PVs) created from the default storage class are encrypted with this specific key.
-
-PVs created by using any other storage class are still encrypted, but the PVs are not encrypted with this key unless the storage class is specifically configured to use this key.
-====
-endif::osd-on-aws[]
 .. Click *Next*.
 
 . On the *Default machine pool* page, select a *Compute node instance type* and a *Compute node count*. The number and types of nodes that are available depend on your {product-title} subscription. If you are using multiple availability zones, the compute node count is per zone.