Merge pull request #49805 from aireilly/td-522

TELCODOCS-522 - ZTP content reorg

Author: skrthomas

_attributes/common-attributes.adoc

@@ -46,6 +46,7 @@ endif::openshift-origin[]
 :rh-storage: OpenShift Data Foundation
 :rh-rhacm-first: Red Hat Advanced Cluster Management (RHACM)
 :rh-rhacm: RHACM
+:rh-rhacm-version: 2.5
 :sandboxed-containers-first: OpenShift sandboxed containers
 :sandboxed-containers-operator: OpenShift sandboxed containers Operator
 :sandboxed-containers-version: 1.3

_topic_maps/_topic_map.yml

@@ -2369,24 +2369,38 @@ Topics:
 - Name: Creating a performance profile
   File: cnf-create-performance-profiles
   Distros: openshift-origin,openshift-enterprise
-- Name: Deploying distributed units manually on single-node OpenShift
-  File: ztp-configuring-single-node-cluster-deployment-during-installation
-  Distros: openshift-origin,openshift-enterprise
-- Name: Validating cluster tuning for vDU application workloads
-  File: ztp-vdu-validating-cluster-tuning
-  Distros: openshift-origin,openshift-enterprise
-- Name: Provisioning and deploying a distributed unit (DU)
-  File: cnf-provisioning-and-deploying-a-distributed-unit
-  Distros: openshift-webscale
 - Name: Workload partitioning on single-node OpenShift
   File: sno-du-enabling-workload-partitioning-on-single-node-openshift
   Distros: openshift-origin,openshift-enterprise
-- Name: Deploying distributed units at scale in a disconnected environment
-  File: ztp-deploying-disconnected
-  Distros: openshift-origin,openshift-enterprise
 - Name: Requesting CRI-O and Kubelet profiling data by using the Node Observability Operator
   File: node-observability-operator
   Distros: openshift-origin,openshift-enterprise
+- Name: Clusters at the network far edge
+  Dir: ztp_far_edge
+  Distros: openshift-origin,openshift-enterprise
+  Topics:
+    - Name: Challenges of the network far edge
+      File: ztp-deploying-far-edge-clusters-at-scale
+    - Name: Preparing the hub cluster for ZTP
+      File: ztp-preparing-the-hub-cluster
+    - Name: Installing managed clusters with RHACM and SiteConfig resources
+      File: ztp-deploying-far-edge-sites
+    - Name: Configuring managed clusters with policies and PolicyGenTemplate resources
+      File: ztp-configuring-managed-clusters-policies
+    - Name: Manually installing a single-node OpenShift cluster with ZTP
+      File: ztp-manual-install
+    - Name: Recommended single-node OpenShift cluster configuration for vDU application workloads
+      File: ztp-reference-cluster-configuration-for-vdu
+    - Name: Validating cluster tuning for vDU application workloads
+      File: ztp-vdu-validating-cluster-tuning
+    - Name: Advanced managed cluster configuration with SiteConfig resources
+      File: ztp-advanced-install-ztp
+    - Name: Advanced managed cluster configuration with PolicyGenTemplate resources
+      File: ztp-advanced-policy-config
+    - Name: Updating managed clusters with the Topology Aware Lifecycle Manager
+      File: ztp-talm-updating-managed-policies
+    - Name: Updating GitOps ZTP
+      File: ztp-updating-gitops
 ---
 Name: Specialized hardware and driver enablement
 Dir: hardware_enablement

images/217_OpenShift_Zero_Touch_Provisioning_updates_1022_1.png

@@ -24,4 +24,4 @@ include::modules/sample-ztp-custom-resources.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* See xref:../../scalability_and_performance/ztp-deploying-disconnected.adoc#ztp-deploying-disconnected[ZTP custom resources] to learn more about ZTP.
+* See xref:../../scalability_and_performance/ztp_far_edge/ztp-deploying-far-edge-clusters-at-scale.adoc#ztp-deploying-far-edge-clusters-at-scale[Challenges of the network far edge] to learn more about zero touch provisioning (ZTP).

images/217_OpenShift_Zero_Touch_Provisioning_updates_1022_2.png

@@ -0,0 +1,23 @@
+// Module included in the following assemblies:
+//
+// * scalability_and_performance/ztp_far_edge/ztp-deploying-far-edge-clusters-at-scale.adoc
+
+:_content-type: CONCEPT
+[id="about-ztp_{context}"]
+= Using ZTP to provision clusters at the network far edge
+
+{rh-rhacm-first} manages clusters in a hub-and-spoke architecture, where a single hub cluster manages many spoke clusters. Hub clusters running {rh-rhacm} provision and deploy the managed clusters by using zero touch provisioning (ZTP) and the assisted service that is deployed when you install {rh-rhacm}.
+
+The assisted service handles provisioning of {product-title} on single node clusters, three-node clusters, or standard clusters running on bare metal.
+
+A high-level overview of using ZTP to provision and maintain bare-metal hosts with {product-title} is as follows:
+
+* A hub cluster running {rh-rhacm} manages an internal registry that mirrors the {product-title} release images. {rh-rhacm} uses the internal registry to provision the managed clusters.
+
+* You manage the bare-metal hosts in a YAML format inventory file, versioned in a Git repository.
+
+* You make the hosts ready for provisioning as managed clusters, and use {rh-rhacm} and the assisted service to install the bare-metal hosts on site.
+
+Installing and deploying the clusters is a two-stage process, involving an initial installation phase, and a subsequent configuration phase. The following diagram illustrates this workflow:
+
+image::217_OpenShift_Zero_Touch_Provisioning_updates_1022_2.png[Using GitOps and ZTP to install and deploy managed clusters]

images/217_OpenShift_Zero_Touch_Provisioning_updates_1022_3.png

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
-// Epic CNF-2600 (CNF-2133) (4.10), Story TELCODOCS-285
-// * scalability_and_performance/ztp-deploying-disconnected.adoc
+//
+// * scalability_and_performance/cnf-talm-for-cluster-upgrades.adoc
 
 :_content-type: PROCEDURE
 [id="cnf-about-topology-aware-lifecycle-manager-blocking-crs_{context}"]

installing/installing_with_agent_based_installer/installing-with-agent-based-installer.adoc

@@ -16,6 +16,6 @@ Supported use cases include the following:
 
 For policies that update an Operator subscription with manual approval, {cgu-operator} provides additional functionality that approves the installation of the updated Operator.
 
-For more information about managed policies, see link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.4/html-single/governance/index#policy-overview[Policy Overview] in the {rh-rhacm} documentation.
+For more information about managed policies, see link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/{rh-rhacm-version}/html-single/governance/index#policy-overview[Policy Overview] in the {rh-rhacm} documentation.
 
 For more information about the `PolicyGenTemplate` CRD, see the "About the PolicyGenTemplate" section in "Deploying distributed units at scale in a disconnected environment".