Merge pull request #64701 from mjpytlak/osdocs-7735

mjpytlak · web-flow · commit e3aa332ea6ff · 2023-09-18T10:10:13.000-04:00
OSDOCS#7735: OpenStack - move install config parameters out of assemb…
diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
@@ -463,6 +463,8 @@ Topics:
     File: uninstalling-cluster-openstack
   - Name: Uninstalling a cluster on OpenStack from your own infrastructure
     File: uninstalling-openstack-user
+  - Name: Installation configuration parameters for OpenStack
+    File: installation-config-parameters-openstack
 - Name: Installing on vSphere
   Dir: installing_vsphere
   Distros: openshift-origin,openshift-enterprise
diff --git a/installing/installing_openstack/installation-config-parameters-openstack.adoc b/installing/installing_openstack/installation-config-parameters-openstack.adoc
@@ -0,0 +1,12 @@
+:_content-type: ASSEMBLY
+[id="installation-config-parameters-openstack"]
+= Installation configuration parameters for OpenStack
+include::_attributes/common-attributes.adoc[]
+:context: installation-config-parameters-openstack
+:platform: OpenStack
+
+toc::[]
+
+Before you deploy an {product-title} cluster on {rh-openstack-first}, 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_openstack/installing-openstack-installer-custom.adoc b/installing/installing_openstack/installing-openstack-installer-custom.adoc
@@ -33,11 +33,9 @@ include::modules/installation-initializing.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
-
-See xref:../../installing/installing_openstack/installing-openstack-installer-custom.adoc#installation-configuration-parameters_installing-openstack-installer-custom[*Installation configuration parameters* section] for more information about the available parameters.
+* xref:../../installing/installing_openstack/installation-config-parameters-openstack.adoc#installation-config-parameters-openstack[Installation configuration parameters for OpenStack]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
-include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
 include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
 include::modules/installation-osp-deploying-bare-metal-machines.adoc[leveloffset=+2]
 include::modules/installation-osp-provider-networks.adoc[leveloffset=+2]
diff --git a/installing/installing_openstack/installing-openstack-installer-kuryr.adoc b/installing/installing_openstack/installing-openstack-installer-kuryr.adoc
@@ -39,8 +39,12 @@ include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+
 include::modules/installation-osp-setting-cloud-provider-options.adoc[leveloffset=+1]
 include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 include::modules/installation-initializing.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_openstack/installation-config-parameters-openstack.adoc#installation-config-parameters-openstack[Installation configuration parameters for OpenStack]
+
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
-include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
 include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
 include::modules/installation-osp-kuryr-config-yaml.adoc[leveloffset=+2]
 include::modules/installation-osp-external-lb-config.adoc[leveloffset=+2]
diff --git a/installing/installing_openstack/installing-openstack-installer-ovs-dpdk.adoc b/installing/installing_openstack/installing-openstack-installer-ovs-dpdk.adoc
@@ -34,8 +34,12 @@ include::modules/installation-osp-verifying-external-network.adoc[leveloffset=+1
 include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+1]
 include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 include::modules/installation-initializing.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_openstack/installation-config-parameters-openstack.adoc#installation-config-parameters-openstack[Installation configuration parameters for OpenStack]
+
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
-include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
 include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
 include::modules/installation-osp-deploying-bare-metal-machines.adoc[leveloffset=+2]
 include::modules/installation-osp-config-yaml.adoc[leveloffset=+2]
diff --git a/installing/installing_openstack/installing-openstack-installer-restricted.adoc b/installing/installing_openstack/installing-openstack-installer-restricted.adoc
@@ -33,8 +33,12 @@ include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+
 include::modules/installation-osp-setting-cloud-provider-options.adoc[leveloffset=+1]
 include::modules/installation-creating-image-restricted.adoc[leveloffset=+1]
 include::modules/installation-initializing.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_openstack/installation-config-parameters-openstack.adoc#installation-config-parameters-openstack[Installation configuration parameters for OpenStack]
+
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
-include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 include::modules/installation-osp-restricted-config-yaml.adoc[leveloffset=+2]
 // include::modules/installation-osp-setting-worker-affinity.adoc[leveloffset=+1]
 include::modules/ssh-agent-using.adoc[leveloffset=+1]
diff --git a/installing/installing_openstack/installing-openstack-user-kuryr.adoc b/installing/installing_openstack/installing-openstack-user-kuryr.adoc
@@ -46,7 +46,11 @@ include::modules/installation-osp-accessing-api-floating.adoc[leveloffset=+2]
 include::modules/installation-osp-accessing-api-no-floating.adoc[leveloffset=+2]
 include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+1]
 include::modules/installation-initializing.adoc[leveloffset=+1]
-include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_openstack/installation-config-parameters-openstack.adoc#installation-config-parameters-openstack[Installation configuration parameters for OpenStack]
+
 include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
 include::modules/installation-osp-kuryr-config-yaml.adoc[leveloffset=+2]
 include::modules/installation-osp-provider-networks.adoc[leveloffset=+2]
diff --git a/installing/installing_openstack/installing-openstack-user-sr-iov-kuryr.adoc b/installing/installing_openstack/installing-openstack-user-sr-iov-kuryr.adoc
@@ -44,7 +44,11 @@ include::modules/installation-osp-accessing-api-floating.adoc[leveloffset=+2]
 include::modules/installation-osp-accessing-api-no-floating.adoc[leveloffset=+2]
 include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+1]
 include::modules/installation-initializing.adoc[leveloffset=+1]
-include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_openstack/installation-config-parameters-openstack.adoc#installation-config-parameters-openstack[Installation configuration parameters for OpenStack]
+
 include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
 include::modules/installation-osp-kuryr-config-yaml.adoc[leveloffset=+2]
 include::modules/installation-osp-fixing-subnet.adoc[leveloffset=+2]
diff --git a/installing/installing_openstack/installing-openstack-user-sr-iov.adoc b/installing/installing_openstack/installing-openstack-user-sr-iov.adoc
@@ -38,7 +38,11 @@ include::modules/installation-osp-accessing-api-floating.adoc[leveloffset=+2]
 include::modules/installation-osp-accessing-api-no-floating.adoc[leveloffset=+2]
 include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+1]
 include::modules/installation-initializing.adoc[leveloffset=+1]
-include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_openstack/installation-config-parameters-openstack.adoc#installation-config-parameters-openstack[Installation configuration parameters for OpenStack]
+
 include::modules/installation-osp-config-yaml.adoc[leveloffset=+2]
 include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
 include::modules/installation-osp-fixing-subnet.adoc[leveloffset=+2]
diff --git a/installing/installing_openstack/installing-openstack-user.adoc b/installing/installing_openstack/installing-openstack-user.adoc
@@ -38,7 +38,11 @@ include::modules/installation-osp-accessing-api-floating.adoc[leveloffset=+2]
 include::modules/installation-osp-accessing-api-no-floating.adoc[leveloffset=+2]
 include::modules/installation-osp-describing-cloud-parameters.adoc[leveloffset=+1]
 include::modules/installation-initializing.adoc[leveloffset=+1]
-include::modules/installation-configuration-parameters.adoc[leveloffset=+1]
+
+[role="_additional-resources"]
+.Additional resources
+* xref:../../installing/installing_openstack/installation-config-parameters-openstack.adoc#installation-config-parameters-openstack[Installation configuration parameters for OpenStack]
+
 include::modules/installation-osp-custom-subnet.adoc[leveloffset=+2]
 include::modules/installation-osp-config-yaml.adoc[leveloffset=+2]
 include::modules/installation-osp-fixing-subnet.adoc[leveloffset=+2]
diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc
@@ -14,14 +14,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_openstack/installing-openstack-installer-custom.adoc
-// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
-// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
-// * installing/installing_openstack/installing-openstack-installer-sr-iov.adoc
-// * installing/installing_openstack/installing-openstack-user-kuryr.adoc
-// * installing/installing_openstack/installing-openstack-user-sr-iov-kuryr.adoc
-// * installing/installing_openstack/installing-openstack-user-sr-iov.adoc
-// * installing/installing_openstack/installing-openstack-user.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
@@ -33,6 +25,7 @@
 // * installing/installing_alibaba/installation-config-parameters-alibaba.adoc
 // * 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
 
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
@@ -78,34 +71,6 @@ endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
 endif::[]
-ifeval::["{context}" == "installing-openstack-installer-custom"]
-:osp:
-:osp-custom:
-endif::[]
-ifeval::["{context}" == "installing-openstack-installer-kuryr"]
-:osp:
-:osp-kuryr:
-endif::[]
-ifeval::["{context}" == "installing-openstack-user"]
-:osp:
-:osp-custom:
-endif::[]
-ifeval::["{context}" == "installing-openstack-user-kuryr"]
-:osp:
-:osp-kuryr:
-endif::[]
-ifeval::["{context}" == "installing-openstack-user-sr-iov"]
-:osp:
-:osp-custom:
-endif::[]
-ifeval::["{context}" == "installing-openstack-user-sr-iov-kuryr"]
-:osp:
-:osp-kuryr:
-endif::[]
-ifeval::["{context}" == "installing-openstack-installer-restricted"]
-:osp:
-:osp-custom:
-endif::[]
 ifeval::["{context}" == "installation-config-parameters-vsphere"]
 :vsphere:
 endif::[]
@@ -139,49 +104,52 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-nutanix"]
 :nutanix:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-openstack"]
+:osp:
+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[]
+ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 = Installation configuration parameters
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 
 // 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[]
+ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 = Available installation configuration parameters for {platform}
-endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 
 // 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[]
+ifndef::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 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[]
+endif::bare,ibm-power,ibm-z,ash,vsphere,gcp,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 
 // 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[]
+ifndef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 [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[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 
 // 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[]
+ifdef::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 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[]
+endif::vsphere,gcp,ibm-z,ibm-power,ash,bare,ibm-cloud,alibaba-cloud,ibm-power-vs,nutanix,osp[]
 
 [id="installation-configuration-parameters-required_{context}"]
 == Required configuration parameters
@@ -2117,34 +2085,6 @@ endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :!aws:
 endif::[]
-ifeval::["{context}" == "installing-openstack-installer-custom"]
-:!osp:
-:!osp-custom:
-endif::[]
-ifeval::["{context}" == "installing-openstack-installer-kuryr"]
-:!osp:
-:!osp-kuryr:
-endif::[]
-ifeval::["{context}" == "installing-openstack-user"]
-:!osp:
-:!osp-custom:
-endif::[]
-ifeval::["{context}" == "installing-openstack-user-kuryr"]
-:!osp:
-:!osp-kuryr:
-endif::[]
-ifeval::["{context}" == "installing-openstack-user-sr-iov"]
-:!osp:
-:!osp-custom:
-endif::[]
-ifeval::["{context}" == "installing-openstack-user-sr-iov-kuryr"]
-:!osp:
-:!osp-kuryr:
-endif::[]
-ifeval::["{context}" == "installing-openstack-installer-restricted"]
-:!osp:
-:!osp-custom:
-endif::[]
 ifeval::["{context}" == "installation-config-parameters-vsphere"]
 :!vsphere:
 endif::[]
@@ -2178,4 +2118,7 @@ endif::[]
 ifeval::["{context}" == "installation-config-parameters-nutanix"]
 :!nutanix:
 endif::[]
+ifeval::["{context}" == "installation-config-parameters-openstack"]
+:!osp:
+endif::[]
 :!platform:
