Merge pull request #42957 from mburke5678/fix-additional-alibaba-params

Author: Bob Furu

modules/cco-ccoctl-creating-at-once.adoc

@@ -179,8 +179,8 @@ ifeval::["{context}" == "cco-mode-sts"]
 :!aws:
 endif::[]
 ifeval::["{context}" == "installing-alibaba-default"]
-:alibabacloud-default:
+:!alibabacloud-default:
 endif::[]
 ifeval::["{context}" == "installing-alibaba-customizations"]
-:alibabacloud-customizations:
+:!alibabacloud-customizations:
 endif::[]

modules/installation-configuration-parameters.adoc

@@ -51,7 +51,7 @@
 // * installing/installing_azure_stack_hub/installing-azure-stack-hub-customizations.adoc
 
 ifeval::["{context}" == "installing-alibaba-customizations"]
-:alibaba:
+:alibabacloud:
 endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
@@ -210,13 +210,13 @@ endif::[]
 = Installation configuration parameters
 
 // If install-config.yaml is generated by openshift-install
-ifndef::bare,ibm-power,ibm-z,ash-default[]
+ifndef::bare,ibm-power,ibm-z,ash[]
 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,ash-default[]
+endif::bare,ibm-power,ibm-z,ash[]
 // If the user manually creates install-config.yaml
-ifdef::bare,ibm-power,ibm-z,ash-default[]
+ifdef::bare,ibm-power,ibm-z,ash[]
 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,ash-default[]
+endif::bare,ibm-power,ibm-z,ash[]
 
 [NOTE]
 ====
@@ -279,7 +279,6 @@ endif::[]
 
 |====
 
-ifndef::ash-default[]
 [id="installation-configuration-parameters-network_{context}"]
 == Network configuration parameters
 
@@ -459,9 +458,8 @@ Set the `networking.machineNetwork` to match the CIDR that the preferred NIC res
 ====
 
 |====
-endif::ash-default[]
 
-ifndef::ash-default[]
+ifndef::ash[]
 [id="installation-configuration-parameters-optional_{context}"]
 == Optional configuration parameters
 
@@ -631,7 +629,7 @@ For production {product-title} clusters on which you want to perform installatio
 a|For example, `sshKey: ssh-ed25519 AAAA..`.
 
 |====
-endif::ash-default[]
+endif::ash[]
 
 ifdef::aws[]
 [id="installation-configuration-parameters-optional-aws_{context}"]
@@ -1356,7 +1354,7 @@ Optional VMware vSphere machine pool configuration parameters are described in t
 
 endif::vsphere,vmc[]
 
-ifdef::ash-default[]
+ifdef::ash[]
 [id="installation-configuration-parameters-additional-azure-stack-hub_{context}"]
 == Additional Azure Stack Hub configuration parameters
 
@@ -1400,9 +1398,9 @@ configuring user-defined routing.
 |String, for example, \https://vhdsa.blob.example.example.com/vhd/rhcos-410.84.202112040202-0-azurestack.x86_64.vhd
 
 |====
-endif::ash-default[]
+endif::ash[]
 
-ifdef::alibaba[]
+ifdef::alibabacloud[]
 //From: https://github.com/openshift/installer/blob/master/data/data/install.openshift.io_installconfigs.yaml#L20; https://github.com/openshift/openshift-docs/pull/40651/files#r792388476
 
 [id="installation-configuration-parameters-additional-alibaba_{context}"]
@@ -1461,13 +1459,13 @@ Additional Alibaba Cloud configuration parameters are described in the following
 
 |====
 
-endif::alibaba[]
+endif::alibabacloud[]
 
 ifdef::bare[]
 :!bare:
 endif::bare[]
 ifeval::["{context}" == "installing-alibaba-customizations"]
-:!alibaba:
+:!alibabacloud:
 endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :!aws: