Merge pull request #61722 from mjpytlak/osdocs-6499

mjpytlak · web-flow · commit ad4bca24f777 · 2023-07-17T09:27:17.000-04:00
OSDOCS#6499: GCP - move install config parameters out of assemblies
diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
@@ -266,6 +266,8 @@ Topics:
     File: installing-restricted-networks-gcp
   - Name: Installing a three-node cluster on GCP
     File: installing-gcp-three-node
+  - Name: Installation configuration parameters for GCP
+    File: installation-config-parameters-gcp
   - Name: Uninstalling a cluster on GCP
     File: uninstalling-cluster-gcp
 - Name: Installing on IBM Cloud VPC
diff --git a/installing/installing_gcp/installation-config-parameters-gcp.adoc b/installing/installing_gcp/installation-config-parameters-gcp.adoc
@@ -0,0 +1,12 @@
+:_content-type: ASSEMBLY
+[id="installation-config-parameters-gcp"]
+= Installation configuration parameters for GCP
+include::_attributes/common-attributes.adoc[]
+:context: installation-config-parameters-gcp
+:platform: GCP
+
+toc::[]
+
+Before you deploy an {product-title} cluster on Google Cloud Platform (GCP), 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]
diff --git a/installing/installing_gcp/installing-gcp-customizations.adoc b/installing/installing_gcp/installing-gcp-customizations.adoc
@@ -28,7 +28,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_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 
diff --git a/installing/installing_gcp/installing-gcp-network-customizations.adoc b/installing/installing_gcp/installing-gcp-network-customizations.adoc
@@ -34,7 +34,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_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 
diff --git a/installing/installing_gcp/installing-gcp-private.adoc b/installing/installing_gcp/installing-gcp-private.adoc
@@ -31,7 +31,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_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 
diff --git a/installing/installing_gcp/installing-gcp-shared-vpc.adoc b/installing/installing_gcp/installing-gcp-shared-vpc.adoc
@@ -7,7 +7,7 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-In {product-title} version {product-version}, you can install a cluster into a shared Virtual Private Cloud (VPC) on Google Cloud Platform (GCP). In this installation method, the cluster is configured to use a VPC from a different GCP project. A shared VPC enables an organization to connect resources from multiple projects to a common VPC network. You can communicate within the organization securely and efficiently by using internal IP addresses from that network. For more information about shared VPC, see link:https://cloud.google.com/vpc/docs/shared-vpc[Shared VPC overview in the GCP documentation]. 
+In {product-title} version {product-version}, you can install a cluster into a shared Virtual Private Cloud (VPC) on Google Cloud Platform (GCP). In this installation method, the cluster is configured to use a VPC from a different GCP project. A shared VPC enables an organization to connect resources from multiple projects to a common VPC network. You can communicate within the organization securely and efficiently by using internal IP addresses from that network. For more information about shared VPC, see link:https://cloud.google.com/vpc/docs/shared-vpc[Shared VPC overview in the GCP documentation].
 
 The installation program provisions the rest of the required infrastructure, which you can further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster.
 
@@ -32,14 +32,16 @@ include::modules/installation-user-infra-generate.adoc[leveloffset=+1]
 
 include::modules/installation-initializing-manual.adoc[leveloffset=+2]
 
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
+
 include::modules/installation-gcp-enabling-shielded-vms.adoc[leveloffset=+2]
 
 include::modules/installation-gcp-enabling-confidential-vms.adoc[leveloffset=+2]
 
 include::modules/installation-gcp-shared-vpc-config.adoc[leveloffset=+2]
 
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
-
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
@@ -65,4 +67,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].
+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].
diff --git a/installing/installing_gcp/installing-gcp-user-infra-vpc.adoc b/installing/installing_gcp/installing-gcp-user-infra-vpc.adoc
@@ -71,6 +71,11 @@ include::modules/installation-deployment-manager-vpc.adoc[leveloffset=+3]
 include::modules/installation-user-infra-generate.adoc[leveloffset=+1]
 
 include::modules/installation-initializing-manual.adoc[leveloffset=+2]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
+
 include::modules/installation-gcp-enabling-shielded-vms.adoc[leveloffset=+2]
 include::modules/installation-gcp-enabling-confidential-vms.adoc[leveloffset=+2]
 include::modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc[leveloffset=+2]
diff --git a/installing/installing_gcp/installing-gcp-user-infra.adoc b/installing/installing_gcp/installing-gcp-user-infra.adoc
@@ -63,6 +63,11 @@ include::modules/installation-using-gcp-custom-machine-types.adoc[leveloffset=+2
 include::modules/installation-user-infra-generate.adoc[leveloffset=+1]
 include::modules/installation-disk-partitioning-upi-templates.adoc[leveloffset=+2]
 include::modules/installation-initializing.adoc[leveloffset=+2]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
+
 include::modules/installation-gcp-enabling-shielded-vms.adoc[leveloffset=+2]
 include::modules/installation-gcp-enabling-confidential-vms.adoc[leveloffset=+2]
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
diff --git a/installing/installing_gcp/installing-gcp-vpc.adoc b/installing/installing_gcp/installing-gcp-vpc.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_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 
diff --git a/installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc b/installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
@@ -39,7 +39,9 @@ include::modules/ssh-agent-using.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_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
 
 include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
 
diff --git a/installing/installing_gcp/installing-restricted-networks-gcp.adoc b/installing/installing_gcp/installing-restricted-networks-gcp.adoc
@@ -69,6 +69,11 @@ include::modules/installation-using-gcp-custom-machine-types.adoc[leveloffset=+2
 include::modules/installation-user-infra-generate.adoc[leveloffset=+1]
 include::modules/installation-disk-partitioning-upi-templates.adoc[leveloffset=+2]
 include::modules/installation-initializing.adoc[leveloffset=+2]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
+
 include::modules/installation-gcp-enabling-shielded-vms.adoc[leveloffset=+2]
 include::modules/installation-gcp-enabling-confidential-vms.adoc[leveloffset=+2]
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc
@@ -21,12 +21,6 @@
 // * installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc
 // * installing/installing_bare_metal/installing-bare-metal.adoc
 // * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
-// * installing/installing_gcp/installing-gcp-customizations.adoc
-// * installing/installing_gcp/installing-gcp-network-customizations.adoc
-// * installing/installing_gcp/installing-gcp-private.adoc
-// * installing/installing_gcp/installing-gcp-vpc.adoc
-// * installing/installing_gcp/installing-gcp-shared-vpc.adoc
-// * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.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
@@ -63,6 +57,7 @@
 // * installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
 // * installing/installing-restricted-networks-nutanix-installer-provisioned.adoc
 // * installing/installing_vsphere/installation-config-parameters-vsphere.adoc
+// * installing/installing_gcp/installation-config-parameters-gcp.adoc
 
 ifeval::["{context}" == "installing-alibaba-customizations"]
 :alibabacloud:
@@ -111,9 +106,6 @@ endif::[]
 ifeval::["{context}" == "installing-azure-vnet"]
 :azure:
 endif::[]
-ifeval::["{context}" == "installing-gcp-customizations"]
-:gcp:
-endif::[]
 ifeval::["{context}" == "installing-bare-metal"]
 :bare:
 endif::[]
@@ -123,21 +115,6 @@ endif::[]
 ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
 :bare:
 endif::[]
-ifeval::["{context}" == "installing-gcp-private"]
-:gcp:
-endif::[]
-ifeval::["{context}" == "installing-gcp-network-customizations"]
-:gcp:
-endif::[]
-ifeval::["{context}" == "installing-gcp-vpc"]
-:gcp:
-endif::[]
-ifeval::["{context}" == "installing-gcp-shared-vpc"]
-:gcp:
-endif::[]
-ifeval::["{context}" == "installing-restricted-networks-gcp-installer-provisioned"]
-:gcp:
-endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
 endif::[]
@@ -252,28 +229,31 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-vsphere"]
 :vsphere:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-gcp"]
+:gcp:
+endif::[]
 
 
 :_content-type: CONCEPT
 [id="installation-configuration-parameters_{context}"]
-ifndef::vsphere[]
+ifndef::vsphere,gcp[]
 = Installation configuration parameters
-endif::vsphere[]
+endif::vsphere,gcp[]
 
 // 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[]
+ifdef::vsphere,gcp[]
 = Available installation configuration parameters for {platform}
-endif::vsphere[]
+endif::vsphere,gcp[]
 
 // 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[]
+ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp[]
 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[]
+endif::bare,ibm-power,ibm-z,ash,vsphere,gcp[]
 
 // If the user manually creates install-config.yaml
 ifdef::bare,ibm-power,ibm-power-vs,ibm-z,ash[]
@@ -283,24 +263,24 @@ endif::bare,ibm-power,ibm-power-vs,ibm-z,ash[]
 // 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[]
+ifndef::vsphere,gcp[]
 [NOTE]
 ====
 After installation, you cannot modify these parameters in the `install-config.yaml` file.
 ====
-endif::vsphere[]
+endif::vsphere,gcp[]
 
 // 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[]
+ifdef::vsphere,gcp[]
 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[]
+endif::vsphere,gcp[]
 
 [id="installation-configuration-parameters-required_{context}"]
 == Required configuration parameters
@@ -2255,24 +2235,6 @@ endif::[]
 ifeval::["{context}" == "installing-azure-vnet"]
 :!azure:
 endif::[]
-ifeval::["{context}" == "installing-gcp-customizations"]
-:!gcp:
-endif::[]
-ifeval::["{context}" == "installing-gcp-private"]
-:!gcp:
-endif::[]
-ifeval::["{context}" == "installing-gcp-network-customizations"]
-:!gcp:
-endif::[]
-ifeval::["{context}" == "installing-gcp-vpc"]
-:!gcp:
-endif::[]
-ifeval::["{context}" == "installing-gcp-shared-vpc"]
-:!gcp:
-endif::[]
-ifeval::["{context}" == "installing-restricted-networks-gcp-installer-provisioned"]
-:!gcp:
-endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :!aws:
 endif::[]
@@ -2378,4 +2340,7 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-vsphere"]
 :!vsphere:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-gcp"]
+:!gcp:
+endif::[]
 :!platform:
