Merge pull request #64049 from mjpytlak/osdocs-6505

OSDOCS#6505: Alibaba - move install config parameters out of assemblies

Author: mjpytlak

_topic_maps/_topic_map.yml

@@ -144,6 +144,8 @@ Topics:
       File: installing-alibaba-network-customizations
     - Name: Installing a cluster on Alibaba Cloud into an existing VPC
       File: installing-alibaba-vpc
+    - Name: Installation configuration parameters for Alibaba Cloud
+      File: installation-config-parameters-alibaba
     - Name: Uninstalling a cluster on Alibaba Cloud
       File: uninstall-cluster-alibaba
 - Name: Installing on AWS
@@ -1948,7 +1950,7 @@ Topics:
   - Name: Setting up a new Argo CD instance
     File: setting-up-argocd-instance
   - Name: Monitoring Argo CD instances
-    File: monitoring-argo-cd-instances  
+    File: monitoring-argo-cd-instances
   - Name: Using Argo Rollouts for progressive deployment delivery
     File: using-argo-rollouts-for-progressive-deployment-delivery
   - Name: Configuring an OpenShift cluster by deploying an application with cluster configurations
@@ -3907,4 +3909,3 @@ Topics:
 #  - Name: Collecting OKD Virtualization data for community report
 #    File: virt-collecting-virt-data
 #    Distros: openshift-origin
-

installing/installing_alibaba/installation-config-parameters-alibaba.adoc

@@ -0,0 +1,12 @@
+:_content-type: ASSEMBLY
+[id="installation-config-parameters-alibaba"]
+= Installation configuration parameters for Alibaba Cloud
+include::_attributes/common-attributes.adoc[]
+:context: installation-config-parameters-alibaba
+:platform: Alibaba Cloud
+
+toc::[]
+
+Before you deploy an {product-title} cluster on Alibaba Cloud, you provide parameters to customize your cluster and the platform that hosts it. When you create the `install-config.yaml` file, you provide values for the required parameters through the command line. You can then modify the `install-config.yaml` file to customize your cluster further.
+
+include::modules/installation-configuration-parameters.adoc[leveloffset=+1]

installing/installing_alibaba/installing-alibaba-customizations.adoc

@@ -33,12 +33,14 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 
 include::modules/installation-initializing.adoc[leveloffset=+2]
 
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_alibaba/installation-config-parameters-alibaba.adoc#installation-config-parameters-alibaba[Installation configuration parameters for Alibaba Cloud]
+
 include::modules/manually-creating-alibaba-manifests.adoc[leveloffset=+2]
 
 include::modules/cco-ccoctl-creating-at-once.adoc[leveloffset=+2]
 
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
-
 include::modules/installation-alibaba-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]

installing/installing_alibaba/installing-alibaba-network-customizations.adoc

@@ -34,12 +34,14 @@ include::modules/nw-network-config.adoc[leveloffset=+1]
 
 include::modules/installation-initializing.adoc[leveloffset=+2]
 
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_alibaba/installation-config-parameters-alibaba.adoc#installation-config-parameters-alibaba[Installation configuration parameters for Alibaba Cloud]
+
 include::modules/manually-creating-alibaba-manifests.adoc[leveloffset=+2]
 
 include::modules/cco-ccoctl-creating-at-once.adoc[leveloffset=+2]
 
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
-
 include::modules/installation-alibaba-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
@@ -77,4 +79,4 @@ include::modules/cluster-telemetry.adoc[leveloffset=+1]
 * xref:../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster].
 * If necessary, you can xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting].
 //Given that manual mode is required to install on Alibaba Cloud, I do not believe this xref is necessary.
-//* If necessary, you can xref:../../authentication/managing_cloud_provider_credentials/cco-mode-mint.adoc#manually-removing-cloud-creds_cco-mode-mint[remove cloud provider credentials].
+//* If necessary, you can xref:../../authentication/managing_cloud_provider_credentials/cco-mode-mint.adoc#manually-removing-cloud-creds_cco-mode-mint[remove cloud provider credentials].

installing/installing_alibaba/installing-alibaba-vpc.adoc

@@ -35,7 +35,9 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 
 include::modules/installation-initializing.adoc[leveloffset=+2]
 
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_alibaba/installation-config-parameters-alibaba.adoc#installation-config-parameters-alibaba[Installation configuration parameters for Alibaba Cloud]
 
 include::modules/installation-alibaba-config-yaml.adoc[leveloffset=+2]
 
@@ -69,4 +71,3 @@ include::modules/cluster-telemetry.adoc[leveloffset=+1]
 * If necessary, you can xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting].
 //Given that manual mode is required to install on Alibaba Cloud, I do not believe this xref is necessary.
 //* If necessary, you can xref:../../authentication/managing_cloud_provider_credentials/cco-mode-mint.adoc#manually-removing-cloud-creds_cco-mode-mint[remove cloud provider credentials].
-

modules/installation-configuration-parameters.adoc

@@ -1,9 +1,5 @@
 // Module included in the following assemblies:
 //
-// * installing/installing_alibaba/installing-alibaba-default.adoc
-// * installing/installing_aws/installing-alibaba-customizations.adoc
-// * installing/installing_alibaba/installing-alibaba-network-customizations.adoc
-// * installing/installing_alibaba_installing-alibaba-vpc.adoc
 // * installing/installing_aws/installing-aws-china.adoc
 // * installing/installing_aws/installing-aws-customizations.adoc
 // * installing/installing_aws/installing-aws-government-region.adoc
@@ -49,13 +45,8 @@
 // * installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc
 // * installing/installing_bare_metal/installation-config-parameters-bare-metal.adoc
 // * installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vps.adoc
+// * installing/installing_alibaba/installation-config-parameters-alibaba.adoc
 
-ifeval::["{context}" == "installing-alibaba-customizations"]
-:alibabacloud:
-endif::[]
-ifeval::["{context}" == "installing-alibaba-vpc"]
-:alibabacloud:
-endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
 endif::[]
@@ -194,28 +185,31 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-ibm-cloud-vpc"]
 :ibm-cloud:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-alibaba"]
+:alibaba-cloud:
+endif::[]
 
 
 :_content-type: CONCEPT
 [id="installation-configuration-parameters_{context}"]
-ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
+ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
 = Installation configuration parameters
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
 
 // Managing headings is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
 // This accommodates the existing IA of the installation assemblies, while the improvement is implemented.
 // As part of the updates for the last provider, the conditions can be removed and the following heading can be used.
-ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
+ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
 = Available installation configuration parameters for {platform}
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
 
 // If install-config.yaml is generated by openshift-install
 // The addition of providers beyond bare,ibm-power,ibm-z,ash is necessary as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493
 // This accommodates the existing IA of the installation assemblies, while the improvement is implemented.
 // As part of the updates for the last provider, content between lines 277-292 can be completely removed.
-ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud[]
+ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud[]
 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,vsphere,gcp,ibm-cloud[]
+endif::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud[]
 
 // If the user manually creates install-config.yaml
 ifdef::ibm-power-vs[]
@@ -225,24 +219,24 @@ endif::ibm-power-vs[]
 // A condition for this note is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
 // This accommodates the existing content for installation assemblies, while the improvement is implemented.
 // As part of the updates for the last provider, this note can be removed from the module.
-ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
+ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
 [NOTE]
 ====
 After installation, you cannot modify these parameters in the `install-config.yaml` file.
 ====
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
 
 // This condition is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
 // As part of the update for each provider, this content applies to the net new provider-specific installation configuration parameter assembly.
 // As part of the updates for the last provider, the conditions can be completely removed.
-ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
+ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
 The following tables specify the required, optional, and {platform}-specific installation configuration parameters that you can set as part of the installation process.
 
 [NOTE]
 ====
 After installation, you cannot modify these parameters in the `install-config.yaml` file.
 ====
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud[]
 
 [id="installation-configuration-parameters-required_{context}"]
 == Required configuration parameters
@@ -896,7 +890,7 @@ For clusters that use AWS Local Zones, you must add AWS Local Zone subnets to th
 |Valid subnet IDs.
 
 |`PreserveBootstrapIgnition`
-|Prevents the S3 bucket from being deleted after completion of bootstrapping. 
+|Prevents the S3 bucket from being deleted after completion of bootstrapping.
 |`true` or `false`. The default value is `false`, which results in the S3 bucket being deleted.
 
 |====
@@ -1879,7 +1873,7 @@ configuring user-defined routing.
 |====
 endif::ash[]
 
-ifdef::alibabacloud[]
+ifdef::alibaba-cloud[]
 //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}"]
@@ -1985,7 +1979,7 @@ If defined, the parameters `compute.platform.alibabacloud` and `controlPlane.pla
 
 |====
 
-endif::alibabacloud[]
+endif::alibaba-cloud[]
 
 ifdef::nutanix[]
 [id="installation-configuration-parameters-additional-vsphere_{context}"]
@@ -2105,12 +2099,6 @@ Additional Nutanix configuration parameters are described in the following table
 --
 endif::nutanix[]
 
-ifeval::["{context}" == "installing-alibaba-customizations"]
-:!alibabacloud:
-endif::[]
-ifeval::["{context}" == "installing-alibaba-vpc"]
-:!alibabacloud:
-endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :!aws:
 endif::[]
@@ -2238,4 +2226,7 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-ibm-cloud-vpc"]
 :!ibm-cloud:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-alibaba"]
+:!alibaba-cloud:
+endif::[]
 :!platform: