From 887be807102576c60e90e386b32bfe106b49218c Mon Sep 17 00:00:00 2001
From: rh-tokeefe <tokeefe@redhat.com>
Date: Tue, 2 Nov 2021 11:13:12 -0400
Subject: [PATCH] OSSMDOC-383: Tasks to publish OSSM 2.1

---
 _topic_map.yml                              |  6 ++++++
 service_mesh/v2x/ossm-federation.adoc       | 20 ++++++++++++++++++++
 service_mesh/v2x/upgrading-ossm-to-2-1.adoc | 11 +++++++----
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/_topic_map.yml b/_topic_map.yml
index a4ba88e838d7..ca24fe058ca3 100644
--- a/_topic_map.yml
+++ b/_topic_map.yml
@@ -2709,6 +2709,8 @@ Topics:
     File: ossm-create-mesh
   - Name: Enabling sidecar injection
     File: prepare-to-deploy-applications-ossm
+  - Name: Upgrading from 2.0 to 2.1
+    File: upgrading-ossm-to-2-1
   - Name: Upgrading from 1.1 to 2.0
     File: upgrading-ossm
   - Name: Managing users and profiles
@@ -2723,6 +2725,8 @@ Topics:
     File: ossm-performance-scalability
   - Name: Deploying to production
     File: ossm-deploy-production
+  - Name: Federation
+    File: ossm-federation
   - Name: Extensions
     File: ossm-extensions
   - Name: Using the 3scale Istio adapter
@@ -2742,6 +2746,8 @@ Topics:
     File: servicemesh-release-notes
   - Name: Service Mesh architecture
     File: ossm-architecture
+  - Name: Service Mesh deployment models
+    File: ossm-deployment-models
   - Name: Service Mesh and Istio differences
     File: ossm-vs-community
   - Name: Preparing to install Service Mesh
diff --git a/service_mesh/v2x/ossm-federation.adoc b/service_mesh/v2x/ossm-federation.adoc
index 199b22dd4653..3e3c6f096e54 100644
--- a/service_mesh/v2x/ossm-federation.adoc
+++ b/service_mesh/v2x/ossm-federation.adoc
@@ -15,10 +15,30 @@ include::modules/ossm-federation-features.adoc[leveloffset=+2]
 
 include::modules/ossm-federation-security.adoc[leveloffset=+2]
 
+include::modules/ossm-federation-limitations.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-prerequisites.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-planning.adoc[leveloffset=+2]
+
 include::modules/ossm-federation-across-cluster.adoc[leveloffset=+2]
 
 include::modules/ossm-federation-checklist.adoc[leveloffset=+2]
 
+include::modules/ossm-federation-config-smcp.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-config-meshPeer.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-create-meshPeer.adoc[leveloffset=+3]
+
+include::modules/ossm-federation-config-export.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-create-export.adoc[leveloffset=+3]
+
+include::modules/ossm-federation-config-import.adoc[leveloffset=+2]
+
+include::modules/ossm-federation-create-import.adoc[leveloffset=+3]
+
 include::modules/ossm-federation-remove-service.adoc[leveloffset=+2]
 
 include::modules/ossm-federation-remove-mesh.adoc[leveloffset=+2]
diff --git a/service_mesh/v2x/upgrading-ossm-to-2-1.adoc b/service_mesh/v2x/upgrading-ossm-to-2-1.adoc
index d595b0fe30d0..f77e7bb11736 100644
--- a/service_mesh/v2x/upgrading-ossm-to-2-1.adoc
+++ b/service_mesh/v2x/upgrading-ossm-to-2-1.adoc
@@ -1,7 +1,7 @@
-[id="ossm-upgrade-to-2-1"]
+[id="upgrading-ossm-to-2-1"]
 = Upgrading {ProductName} from version 2.0 to version 2.1
 include::modules/ossm-document-attributes.adoc[]
-:context: oossm-upgrading-to-2-1
+:context: upgrading-ossm-to-2-1
 
 toc::[]
 
@@ -35,8 +35,11 @@ $ oc project istio-system
 ----
 $ oc get smcp -o yaml
 ----
-
-TIP: Back up your control plane configuration.
++
+[TIP]
+====
+Back up your control plane configuration.
+====
 
 . Update the `.spec.version` field from v2.0 to v2.1, and apply the configuration.
 +