Merge pull request #63813 from mjpytlak/osdocs-6503

OSDOCS#6503: IBM Cloud VPC - move install config parameters out of as…

Author: mjpytlak

_topic_maps/_topic_map.yml

@@ -290,6 +290,8 @@ Topics:
     File: installing-ibm-cloud-vpc
   - Name: Installing a private cluster on IBM Cloud VPC
     File: installing-ibm-cloud-private
+  - Name: Installation configuration parameters for IBM Cloud VPC
+    File: installation-config-parameters-ibm-cloud-vpc
   - Name: Uninstalling a cluster on IBM Cloud VPC
     File: uninstalling-cluster-ibm-cloud
 - Name: Installing on Nutanix

installing/installing_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc

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

@@ -27,7 +27,9 @@ include::modules/installation-ibm-cloud-export-variables.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_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for IBM Cloud VPC]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 

installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc

@@ -30,7 +30,9 @@ include::modules/installation-ibm-cloud-export-variables.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_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for IBM Cloud VPC]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 

installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc

@@ -33,7 +33,9 @@ include::modules/installation-ibm-cloud-export-variables.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_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for IBM Cloud VPC]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 

installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc

@@ -29,7 +29,9 @@ include::modules/installation-ibm-cloud-export-variables.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_ibm_cloud_public/installation-config-parameters-ibm-cloud-vpc.adoc#installation-config-parameters-ibm-cloud-vpc[Installation configuration parameters for IBM Cloud VPC]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 

modules/installation-configuration-parameters.adoc

@@ -18,10 +18,6 @@
 // * installing/installing_azure/installing-azure-network-customizations.adoc
 // * installing/installing_azure/installing-azure-private.adoc
 // * installing/installing_azure/installing-azure-vnet.adoc
-// * installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.adoc
-// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc
-// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc
-// * installing/installing_ibm_cloud_public/intalling-ibm-cloud-private.adoc
 // * installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc
 // * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc
 // * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
@@ -52,6 +48,7 @@
 // * installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc
 // * 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
 
 ifeval::["{context}" == "installing-alibaba-customizations"]
 :alibabacloud:
@@ -103,20 +100,6 @@ endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
 endif::[]
-ifeval::["{context}" == "installing-ibm-cloud-customizations"]
-:ibm-cloud:
-endif::[]
-ifeval::["{context}" == "installing-ibm-cloud-network-customizations"]
-:ibm-cloud:
-endif::[]
-ifeval::["{context}" == "installing-ibm-cloud-vpc"]
-:ibm-cloud:
-:ibm-cloud-vpc:
-endif::[]
-ifeval::["{context}" == "installing-ibm-cloud-private"]
-:ibm-cloud:
-:ibm-cloud-vpc:
-endif::[]
 ifeval::["{context}" == "installing-openstack-installer-custom"]
 :osp:
 :osp-custom:
@@ -208,28 +191,31 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-bare-metal"]
 :bare:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-ibm-cloud-vpc"]
+:ibm-cloud:
+endif::[]
 
 
 :_content-type: CONCEPT
 [id="installation-configuration-parameters_{context}"]
-ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare[]
+ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
 = Installation configuration parameters
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-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[]
+ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
 = Available installation configuration parameters for {platform}
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-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[]
+ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-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[]
+endif::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud[]
 
 // If the user manually creates install-config.yaml
 ifdef::ibm-power-vs[]
@@ -239,24 +225,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[]
+ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
 [NOTE]
 ====
 After installation, you cannot modify these parameters in the `install-config.yaml` file.
 ====
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-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[]
+ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-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[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud[]
 
 [id="installation-configuration-parameters-required_{context}"]
 == Required configuration parameters
@@ -524,9 +510,9 @@ networking:
 |`networking.machineNetwork.cidr`
 |
 Required if you use `networking.machineNetwork`. An IP address block. The default value is `10.0.0.0/16` for all platforms other than libvirt and {ibmpowerProductName} Virtual Server. For libvirt, the default value is `192.168.126.0/24`. For {ibmpowerProductName} Virtual Server, the default value is `192.168.0.0/24`.
-ifdef::ibm-cloud-vpc[]
-The CIDR must contain the subnets defined in `platform.ibmcloud.controlPlaneSubnets` and `platform.ibmcloud.computeSubnets`.
-endif::ibm-cloud-vpc[]
+ifdef::ibm-cloud[]
+If you are deploying the cluster to an existing Virtual Private Cloud (VPC), the CIDR must contain the subnets defined in `platform.ibmcloud.controlPlaneSubnets` and `platform.ibmcloud.computeSubnets`.
+endif::ibm-cloud[]
 |
 An IP network block in CIDR notation.
 
@@ -2157,20 +2143,6 @@ endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :!aws:
 endif::[]
-ifeval::["{context}" == "installing-ibm-cloud-customizations"]
-:!ibm-cloud:
-endif::[]
-ifeval::["{context}" == "installing-ibm-cloud-network-customizations"]
-:!ibm-cloud:
-endif::[]
-ifeval::["{context}" == "installing-ibm-cloud-vpc"]
-:!ibm-cloud:
-:!ibm-cloud-vpc:
-endif::[]
-ifeval::["{context}" == "installing-ibm-cloud-private"]
-:!ibm-cloud:
-:!ibm-cloud-vpc:
-endif::[]
 ifeval::["{context}" == "installing-openstack-installer-custom"]
 :!osp:
 :!osp-custom:
@@ -2253,4 +2225,7 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-bare-metal"]
 :!bare:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-ibm-cloud-vpc"]
+:!ibm-cloud:
+endif::[]
 :!platform: