Updated the HCP migration to include the ROSA Tutorals and Learning sections

Author: EricPonvelle

_topic_maps/_topic_map_rosa_hcp.yml

@@ -129,6 +129,12 @@ Topics:
 #   File: cloud-experts-dynamic-certificate-custom-domain
 # - Name: Assigning consistent egress IP for external traffic
 #   File: cloud-experts-consistent-egress-ip
+- Name: Getting started with ROSA
+  Dir: cloud-experts-getting-started
+  Distros: openshift-rosa-hcp
+  Topics:
+  - Name: Obtaining support
+    File: cloud-experts-getting-started-support
 - Name: Deploying an application
   Dir: cloud-experts-deploying-application
   Distros: openshift-rosa-hcp
@@ -140,17 +146,6 @@ Topics:
   - Name: Lab Overview
     File: cloud-experts-deploying-application-lab-overview
 # ---
-# Name: Getting started
-# Dir: rosa_getting_started
-# Distros: openshift-rosa-hcp
-# Topics:
-# - Name: ROSA quickstart guide
-#   File: rosa-quickstart-guide-ui
-# - Name: Comprehensive guide to getting started with ROSA
-#   File: rosa-getting-started
-# - Name: Understanding the ROSA with STS deployment workflow
-#   File: rosa-sts-getting-started-workflow
-# ---
 # Name: Prepare your environment
 # Dir: rosa_planning
 # Distros: openshift-rosa-hcp

cloud_experts_tutorials/cloud-experts-deploying-application/cloud-experts-deploying-application-prerequisites.adoc

@@ -13,12 +13,22 @@ toc::[]
 
 . A Provisioned ROSA cluster
 +
+<<<<<<< HEAD
 ifdef::openshift-rosa-hcp[]
 This lab assumes you have access to a successfully provisioned a ROSA cluster. If you have not yet created a ROSA cluster, see xref:../../rosa_hcp/rosa-hcp-quickstart-guide.adoc#rosa-getting-started-environment-setup_rosa-hcp-quickstart-guide[ROSA with HCP quick start guide] for more information.
 endif::openshift-rosa-hcp[]
 ifdef::openshift-rosa[]
 This lab assumes you have access to a successfully provisioned a ROSA cluster. If you have not yet created a ROSA cluster, see xref:../../rosa_getting_started/rosa-quickstart-guide-ui.adoc#rosa-getting-started-environment-setup_rosa-quickstart-guide-ui[ROSA quick start guide] for more information.
 endif::openshift-rosa[]
+=======
+This lab assumes you have access to a successfully provisioned a ROSA cluster. If you have not yet created a ROSA cluster, see 
+ifdef::openshift-rosa-hcp[]
+link:https://docs.openshift.com/rosa/rosa_getting_started/rosa-quickstart-guide-ui.html#rosa-getting-started-prerequisites_rosa-quickstart-guide-ui[Red{nbsp}Hat OpenShift Service on AWS quick start guide] for more information.
+endif::openshift-rosa-hcp[]
+ifndef::openshift-rosa-hcp[]
+xref:../../rosa_getting_started/rosa-quickstart-guide-ui.adoc#rosa-getting-started-prerequisites_rosa-quickstart-guide-ui[Red{nbsp}Hat OpenShift Service on AWS quick start guide] for more information.
+endif::openshift-rosa-hcp[]
+>>>>>>> 7f6bdc8cdc (Updated the HCP migration to include the ROSA Tutorals and Learning sections)
 
 . The OpenShift Command Line Interface (CLI)
 +