Merge pull request #64970 from mjpytlak/osdocs-6501

OSDOCS#6501: Azure - move install config parameters out of assemblies

Author: mjpytlak

_topic_maps/_topic_map.yml

@@ -219,6 +219,8 @@ Topics:
     File: installing-azure-three-node
   - Name: Uninstalling a cluster on Azure
     File: uninstalling-cluster-azure
+  - Name: Installation configuration parameters for Azure
+    File: installation-config-parameters-azure
 - Name: Installing on Azure Stack Hub
   Dir: installing_azure_stack_hub
   Distros: openshift-origin,openshift-enterprise

installing/installing_azure/installation-config-parameters-azure.adoc

@@ -0,0 +1,12 @@
+:_content-type: ASSEMBLY
+[id="installation-config-parameters-azure"]
+= Installation configuration parameters for Azure
+include::_attributes/common-attributes.adoc[]
+:context: installation-config-parameters-azure
+:platform: Azure
+
+toc::[]
+
+Before you deploy an {product-title} cluster on Microsoft Azure, 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_azure/installing-azure-customizations.adoc

@@ -35,7 +35,9 @@ include::modules/querying-user-defined-tags-azure.adoc[leveloffset=+1]
 
 include::modules/installation-initializing.adoc[leveloffset=+1]
 
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_azure/installation-config-parameters-azure.adoc#installation-config-parameters-azure[Installation configuration parameters for Azure]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 

installing/installing_azure/installing-azure-government-region.adoc

@@ -38,7 +38,9 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 
 include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_azure/installation-config-parameters-azure.adoc#installation-config-parameters-azure[Installation configuration parameters for Azure]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 

installing/installing_azure/installing-azure-network-customizations.adoc

@@ -33,7 +33,9 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 
 include::modules/installation-initializing.adoc[leveloffset=+1]
 
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_azure/installation-config-parameters-azure.adoc#installation-config-parameters-azure[Installation configuration parameters for Azure]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 

installing/installing_azure/installing-azure-private.adoc

@@ -33,7 +33,9 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 
 include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_azure/installation-config-parameters-azure.adoc#installation-config-parameters-azure[Installation configuration parameters for Azure]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 

installing/installing_azure/installing-azure-vnet.adoc

@@ -27,7 +27,9 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 
 include::modules/installation-initializing.adoc[leveloffset=+1]
 
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_azure/installation-config-parameters-azure.adoc#installation-config-parameters-azure[Installation configuration parameters for Azure]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 

modules/installation-configuration-parameters.adoc

@@ -9,11 +9,6 @@
 // * installing/installing_aws/installing-aws-vpc.adoc
 // * installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc
 // * installing/installing_aws/installing-aws-outposts-remote-workers.adoc
-// * installing/installing_azure/installing-azure-customizations.adoc
-// * installing/installing_azure/installing-azure-government-region.adoc
-// * installing/installing_azure/installing-azure-network-customizations.adoc
-// * installing/installing_azure/installing-azure-private.adoc
-// * installing/installing_azure/installing-azure-vnet.adoc
 // * installing/installing_vsphere/installation-config-parameters-vsphere.adoc
 // * installing/installing_gcp/installation-config-parameters-gcp.adoc
 // * installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc
@@ -25,6 +20,7 @@
 // * installing/installing_ibm_powervs/installation-config-parameters-ibm-power-vs.adoc
 // * installing/installing_nutanix/installation-config-parameters-nutanix.adoc
 // * installing/installing_openstack/installation-config-parameters-openstack.adoc
+// * installing/installing_azure/installation-config-parameters-azure.adoc
 
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
@@ -52,21 +48,6 @@ endif::[]
 ifeval::["{context}" == "installing-aws-outposts-remote-workers"]
 :aws:
 endif::[]
-ifeval::["{context}" == "installing-azure-customizations"]
-:azure:
-endif::[]
-ifeval::["{context}" == "installing-azure-government-region"]
-:azure:
-endif::[]
-ifeval::["{context}" == "installing-azure-network-customizations"]
-:azure:
-endif::[]
-ifeval::["{context}" == "installing-azure-private"]
-:azure:
-endif::[]
-ifeval::["{context}" == "installing-azure-vnet"]
-:azure:
-endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
 endif::[]
@@ -103,49 +84,52 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-openstack"]
 :osp:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-azure"]
+:azure:
+endif::[]
 
 :_content-type: CONCEPT
 [id="installation-configuration-parameters_{context}"]
-ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 = Installation configuration parameters
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 
 // 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,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 = Available installation configuration parameters for {platform}
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 
 // 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,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 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,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+endif::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 
 // 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,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 [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,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 
 // 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,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 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,alibaba-cloud,ibm-power-vs,nutanix,osp[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp,azure[]
 
 [id="installation-configuration-parameters-required_{context}"]
 == Required configuration parameters
@@ -2063,21 +2047,6 @@ endif::[]
 ifeval::["{context}" == "installing-aws-outposts-remote-workers"]
 :!aws:
 endif::[]
-ifeval::["{context}" == "installing-azure-customizations"]
-:!azure:
-endif::[]
-ifeval::["{context}" == "installing-azure-government-region"]
-:!azure:
-endif::[]
-ifeval::["{context}" == "installing-azure-network-customizations"]
-:!azure:
-endif::[]
-ifeval::["{context}" == "installing-azure-private"]
-:!azure:
-endif::[]
-ifeval::["{context}" == "installing-azure-vnet"]
-:!azure:
-endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :!aws:
 endif::[]
@@ -2114,4 +2083,7 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-openstack"]
 :!osp:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-azure"]
+:!azure:
+endif::[]
 :!platform: