Merge pull request #79400 from abrennan89/OSDOCS-11445

abrennan89 · web-flow · commit 377f8319d8ef · 2024-07-29T12:01:44.000-05:00
OSDOCS-11445: Remove duplicated content from Networking section in postinstallation guide
diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
@@ -478,6 +478,8 @@ Topics:
     File: installing-openstack-user
   - Name: Installing a cluster on OpenStack in a restricted network
     File: installing-openstack-installer-restricted
+  - Name: Configuring network settings after installing OpenStack
+    File: installing-openstack-network-config
   - Name: OpenStack Cloud Controller Manager reference guide
     File: installing-openstack-cloud-config-reference
   - Name: Deploying on OpenStack with rootVolume and etcd on local disk
@@ -621,8 +623,8 @@ Topics:
   File: cluster-tasks
 - Name: Node tasks
   File: node-tasks
-- Name: Network configuration
-  File: network-configuration
+- Name: Postinstallation network configuration
+  File: post-install-network-configuration
 - Name: Storage configuration
   File: post-install-storage-configuration
 - Name: Preparing for users
diff --git a/installing/installing_openstack/installing-openstack-installer-custom.adoc b/installing/installing_openstack/installing-openstack-installer-custom.adoc
@@ -78,10 +78,11 @@ include::modules/cluster-telemetry.adoc[leveloffset=+1]
 
 * See xref:../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service
 
+[id="next-steps_{context}"]
 == Next steps
 
 * 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].
 * If you need to enable external access to node ports, xref:../../networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-nodeport.adoc#nw-using-nodeport_configuring-ingress-cluster-traffic-nodeport[configure ingress cluster traffic by using a node port].
-* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../post_installation_configuration/network-configuration.adoc#installation-osp-configuring-api-floating-ip_post-install-network-configuration[configure {rh-openstack} access with floating IP addresses].
+* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../installing/installing_openstack/installing-openstack-network-config.adoc#installation-osp-configuring-api-floating-ip_installing-openstack-network-config[configure {rh-openstack} access with floating IP addresses].
diff --git a/installing/installing_openstack/installing-openstack-installer-ovs-dpdk.adoc b/installing/installing_openstack/installing-openstack-installer-ovs-dpdk.adoc
@@ -85,4 +85,4 @@ 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].
 * If you need to enable external access to node ports, xref:../../networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-nodeport.adoc#nw-using-nodeport_configuring-ingress-cluster-traffic-nodeport[configure ingress cluster traffic by using a node port].
-* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../post_installation_configuration/network-configuration.adoc#installation-osp-configuring-api-floating-ip_post-install-network-configuration[configure {rh-openstack} access with floating IP addresses].
+* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../installing/installing_openstack/installing-openstack-network-config.adoc#installation-osp-configuring-api-floating-ip_installing-openstack-network-config[configure {rh-openstack} access with floating IP addresses].
diff --git a/installing/installing_openstack/installing-openstack-installer-restricted.adoc b/installing/installing_openstack/installing-openstack-installer-restricted.adoc
@@ -72,4 +72,4 @@ xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reportin
 * If necessary, see xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#insights-operator-register-disconnected-cluster_opting-out-remote-health-reporting[Registering your disconnected cluster]
 * xref:../../post_installation_configuration/cluster-tasks.adoc#post-install-must-gather-disconnected[Configure image streams] for the Cluster Samples Operator and the `must-gather` tool.
 * Learn how to xref:../../operators/admin/olm-restricted-networks.adoc#olm-restricted-networks[use Operator Lifecycle Manager (OLM) on restricted networks].
-* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../post_installation_configuration/network-configuration.adoc#installation-osp-configuring-api-floating-ip_post-install-network-configuration[configure {rh-openstack} access with floating IP addresses].
+* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../installing/installing_openstack/installing-openstack-network-config.adoc#installation-osp-configuring-api-floating-ip_installing-openstack-network-config[configure {rh-openstack} access with floating IP addresses].
diff --git a/installing/installing_openstack/installing-openstack-network-config.adoc b/installing/installing_openstack/installing-openstack-network-config.adoc
@@ -0,0 +1,17 @@
+:_mod-docs-content-type: ASSEMBLY
+include::_attributes/common-attributes.adoc[]
+include::_attributes/attributes-openshift-dedicated.adoc[]
+[id="installing-openstack-network-config"]
+= Configuring network settings after installing OpenStack
+:context: installing-openstack-network-config
+
+toc::[]
+
+You can configure network settings for an {product-title} on {rh-openstack-first} cluster after installation.
+
+include::modules/installation-osp-configuring-api-floating-ip.adoc[leveloffset=+1]
+include::modules/nw-osp-enabling-ovs-offload.adoc[leveloffset=+1]
+include::modules/nw-osp-hardware-offload-attaching-network.adoc[leveloffset=+1]
+include::modules/nw-osp-pod-connections-ipv6.adoc[leveloffset=+1]
+include::modules/nw-osp-pod-creating-ipv6.adoc[leveloffset=+1]
+include::modules/nw-osp-pod-adding-connections-ipv6.adoc[leveloffset=+1]
diff --git a/installing/installing_openstack/installing-openstack-user-sr-iov.adoc b/installing/installing_openstack/installing-openstack-user-sr-iov.adoc
@@ -102,4 +102,4 @@ 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].
 * If you need to enable external access to node ports, xref:../../networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-nodeport.adoc#nw-using-nodeport_configuring-ingress-cluster-traffic-nodeport[configure ingress cluster traffic by using a node port].
-* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../post_installation_configuration/network-configuration.adoc#installation-osp-configuring-api-floating-ip_post-install-network-configuration[configure {rh-openstack} access with floating IP addresses].
+* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../installing/installing_openstack/installing-openstack-network-config.adoc#installation-osp-configuring-api-floating-ip_installing-openstack-network-config[configure {rh-openstack} access with floating IP addresses].
diff --git a/installing/installing_openstack/installing-openstack-user.adoc b/installing/installing_openstack/installing-openstack-user.adoc
@@ -87,4 +87,4 @@ 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].
 * If you need to enable external access to node ports, xref:../../networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-nodeport.adoc#nw-using-nodeport_configuring-ingress-cluster-traffic-nodeport[configure ingress cluster traffic by using a node port].
-* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../post_installation_configuration/network-configuration.adoc#installation-osp-configuring-api-floating-ip_post-install-network-configuration[configure {rh-openstack} access with floating IP addresses].
+* If you did not configure {rh-openstack} to accept application traffic over floating IP addresses, xref:../../installing/installing_openstack/installing-openstack-network-config.adoc#installation-osp-configuring-api-floating-ip_installing-openstack-network-config[configure {rh-openstack} access with floating IP addresses].
diff --git a/modules/baseline-router-performance.adoc b/modules/baseline-router-performance.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 // * scalability_and_performance/optimization/routing-optimization.adoc
-// * post_installation_configuration/network-configuration.adoc
 
+:_mod-docs-content-type: CONCEPT
 [id="baseline-router-performance_{context}"]
 = Baseline Ingress Controller (router) performance
 
diff --git a/modules/configuring-haproxy-interval.adoc b/modules/configuring-haproxy-interval.adoc
@@ -1,6 +1,5 @@
 // Module included in the following assemblies:
 // * scalability_and_performance/optimization/routing-optimization.adoc
-// * post_installation_configuration/network-configuration.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="configuring-haproxy-interval_{context}"]
diff --git a/modules/ingress-liveness-readiness-startup-probes.adoc b/modules/ingress-liveness-readiness-startup-probes.adoc
@@ -1,6 +1,5 @@
 // Module included in the following assemblies:
 // * scalability_and_performance/optimization/routing-optimization.adoc
-// * post_installation_configuration/network-configuration.adoc
 
 :_mod-docs-content-type: REFERENCE
 [id="ingress-liveness-readiness-startup-probes_{context}"]
diff --git a/modules/installation-osp-configuring-api-floating-ip.adoc b/modules/installation-osp-configuring-api-floating-ip.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * post_installation_configuration/network-configuration.adoc
+// * installing/installing_openstack/installing-openstack-network-config.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="installation-osp-configuring-api-floating-ip_{context}"]
diff --git a/modules/nw-networkpolicy-about.adoc b/modules/nw-networkpolicy-about.adoc
@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * networking/network_security/network_policy/about-network-policy.adoc
-// * post_installation_configuration/network-configuration.adoc
 
 :_mod-docs-content-type: CONCEPT
 [id="nw-networkpolicy-about_{context}"]
diff --git a/modules/nw-networkpolicy-multitenant-isolation.adoc b/modules/nw-networkpolicy-multitenant-isolation.adoc
@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * networking/network_security/network_policy/multitenant-network-policy.adoc
-// * post_installation_configuration/network-configuration.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="nw-networkpolicy-multitenant-isolation_{context}"]
diff --git a/modules/nw-osp-enabling-ovs-offload.adoc b/modules/nw-osp-enabling-ovs-offload.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * post_installation_configuration/network-configuration.adoc
+// * installing/installing_openstack/installing-openstack-network-config.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="nw-osp-enabling-ovs-offload_{context}"]
@@ -18,7 +18,7 @@ OVS is a multi-layer virtual switch that enables large-scale, multi-server netwo
 
 [NOTE]
 ====
-Application layer gateway flows are broken in {product-title} version 4.10, 4.11, and 4.12. Also, you cannot offload the application layer gateway flow for {product-title} version 4.13. 
+Application layer gateway flows are broken in {product-title} version 4.10, 4.11, and 4.12. Also, you cannot offload the application layer gateway flow for {product-title} version 4.13.
 ====
 
 .Procedure
@@ -123,4 +123,4 @@ spec:
   containers:
   - name: dpdk-testpmd
     image: quay.io/krister/centos8_nfv-container-dpdk-testpmd:latest
-----
+----
diff --git a/modules/nw-osp-hardware-offload-attaching-network.adoc b/modules/nw-osp-hardware-offload-attaching-network.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * post_installation_configuration/network-configuration.adoc
+// * installing/installing_openstack/installing-openstack-network-config.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="nw-osp-hardware-offload-attaching-network_{context}"]
@@ -41,4 +41,4 @@ $ oc describe SriovNetworkNodeState -n openshift-sriov-network-operator
 [source,terminal]
 ----
 $ oc apply -f network.yaml
-----
+----
diff --git a/modules/nw-osp-pod-adding-connections-ipv6.adoc b/modules/nw-osp-pod-adding-connections-ipv6.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * post_installation_configuration/network-configuration.adoc
+// * installing/installing_openstack/installing-openstack-network-config.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="nw-osp-pod-adding-connections-ipv6_{context}"]
diff --git a/modules/nw-osp-pod-connections-ipv6.adoc b/modules/nw-osp-pod-connections-ipv6.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * post_installation_configuration/network-configuration.adoc
+// * installing/installing_openstack/installing-openstack-network-config.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="nw-osp-pod-connections-ipv6_{context}"]
@@ -24,11 +24,11 @@ Only the following IPv6 additional network configurations are supported:
 +
 [source,terminal]
 ----
-$ openstack port set --no-security-group --disable-port-security <compute_ipv6_port>
+$ openstack port set --no-security-group --disable-port-security <compute_ipv6_port> # <1>
 ----
+<1> Specify the IPv6 port of the compute server.
 +
-IMPORTANT: This command removes security groups from the port and disables port security. Traffic restrictions are removed entirely from the port.
-
-where:
-
-<compute_ipv6_port>:: Specifies the IPv6 port of the compute server.
+[IMPORTANT]
+====
+This command removes security groups from the port and disables port security. Traffic restrictions are removed entirely from the port.
+====
diff --git a/modules/nw-osp-pod-creating-ipv6.adoc b/modules/nw-osp-pod-creating-ipv6.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * post_installation_configuration/network-configuration.adoc
+// * installing/installing_openstack/installing-openstack-network-config.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="nw-osp-pod-creating-ipv6_{context}"]
@@ -60,9 +60,6 @@ spec:
 +
 [source,terminal]
 ----
-$ oc create -f <ipv6_enabled_resource>
+$ oc create -f <ipv6_enabled_resource> # <1>
 ----
-
-where:
-
-<ipv6_enabled_resource>:: Specifies the file that contains your resource definition.
+<1> Specify the file that contains your resource definition.
diff --git a/modules/nw-proxy-configure-object.adoc b/modules/nw-proxy-configure-object.adoc
@@ -2,7 +2,6 @@
 //
 // * networking/configuring-a-custom-pki.adoc
 // * networking/enable-cluster-wide-proxy.adoc
-// * post_installation_configuration/network-configuration.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="nw-proxy-configure-object_{context}"]
diff --git a/modules/private-clusters-setting-dns-private.adoc b/modules/private-clusters-setting-dns-private.adoc
@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * post_installation_configuration/configuring-private-cluster.adoc
-// * post_installation_configuration/network-configuration.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="private-clusters-setting-dns-private_{context}"]
diff --git a/networking/cluster-network-operator.adoc b/networking/cluster-network-operator.adoc
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-The Cluster Network Operator (CNO) deploys and manages the cluster network components on an {product-title} cluster, including the Container Network Interface (CNI) network plugin selected for the cluster during installation.
+include::snippets/cluster-network-operator-abstract.adoc[]
 
 include::modules/nw-cluster-network-operator.adoc[leveloffset=+1]
 
@@ -21,7 +21,6 @@ include::modules/nw-operator-cr.adoc[leveloffset=+1]
 [role="_additional-resources"]
 [id="cluster-network-operator-additional-resources"]
 == Additional resources
-
 * xref:../rest_api/operator_apis/network-operator-openshift-io-v1.adoc#network-operator-openshift-io-v1[`Network` API in the `operator.openshift.io` API group]
 * xref:../networking/configuring-cluster-network-range.adoc#nw-cluster-network-range-edit_configuring-cluster-network-range[Modifying the `clusterNetwork` IP address range]
 * xref:../networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc#migrate-from-openshift-sdn[Migrating from the OpenShift SDN network plugin]
diff --git a/post_installation_configuration/index.adoc b/post_installation_configuration/index.adoc
@@ -56,20 +56,6 @@ The following lists details these configurations:
 ** Configure the maximum number of pods per node.
 ** Enable Device Manager.
 
-* xref:../post_installation_configuration/network-configuration.adoc#post-install-network-configuration[Configure network]: After installing {product-title}, you can configure the following components:
-
-** Ingress cluster traffic
-** Node port service range
-** Network policy
-** Enabling the cluster-wide proxy
-
-* xref:../post_installation_configuration/post-install-storage-configuration.adoc#post-install-storage-configuration[Configure storage]:
-By default, containers operate by using the ephemeral storage or transient local storage. The ephemeral storage has a lifetime limitation. To store the data for a long time, you must configure persistent storage. You can configure storage by using one of the following methods:
-
-** *Dynamic provisioning*: You can dynamically provision storage on demand by defining and creating storage classes that control different levels of storage, including storage access.
-
-** *Static provisioning*: You can use Kubernetes persistent volumes to make existing storage available to a cluster. Static provisioning can support various device configurations and mount options.
-
 * xref:../post_installation_configuration/preparing-for-users.adoc#post-install-preparing-for-users[Configure users]: OAuth access tokens allow users to authenticate themselves to the API. You can configure OAuth to perform the following tasks:
 
 * Specify an identity provider
diff --git a/post_installation_configuration/network-configuration.adoc b/post_installation_configuration/network-configuration.adoc
diff --git a/post_installation_configuration/post-install-network-configuration.adoc b/post_installation_configuration/post-install-network-configuration.adoc
diff --git a/post_installation_configuration/post-install-storage-configuration.adoc b/post_installation_configuration/post-install-storage-configuration.adoc
diff --git a/snippets/cluster-network-operator-abstract.adoc b/snippets/cluster-network-operator-abstract.adoc
