OSDOCS-11269

Author: jneczypor

_topic_maps/_topic_map_rosa_hcp.yml

@@ -129,28 +129,6 @@ 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: Creating an admin user
-    File: cloud-experts-getting-started-admin
-#   - Name: Setting up an identity provider
-#     File: cloud-experts-getting-started-idp
-#   - Name: Granting admin rights
-#     File: cloud-experts-getting-started-admin-rights
-#   - Name: Accessing your cluster
-#     File: cloud-experts-getting-started-accessing
-#   - Name: Managing worker nodes
-#     File: cloud-experts-getting-started-managing-worker-nodes
-#   - Name: Autoscaling
-#     File: cloud-experts-getting-started-autoscaling
-#   - Name: Upgrading your cluster
-#     File: cloud-experts-getting-started-upgrading
-#   - Name: Deleting your cluster
-#     File: cloud-experts-getting-started-deleting
-  - Name: Obtaining support
-    File: cloud-experts-getting-started-support
 - Name: Deploying an application
   Dir: cloud-experts-deploying-application
   Distros: openshift-rosa-hcp

rosa_learning/creating_cluster_workshop/cloud-experts-getting-started-managing-worker-nodes.adoc

@@ -215,13 +215,17 @@ rosa create machinepool --cluster=<cluster-name> --name=<mp-name> --replicas=<nu
 rosa create machinepool --cluster=my-rosa-cluster --name=db-nodes-large-mp --replicas=2 --labels='app=db','tier=backend' --instance-type=m5.2xlarge
 ----
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 . To see all the xref:../../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-aws-instance-types_rosa-service-definition[instance types available], run the following command:
 =======
 ifdef::openshift-rosa-hcp[]
 . To see all the link:https://docs.openshift.com/rosa/rosa_architecture/rosa_policy_service_definition/rosa-instance-types.html[instance types available], run the following command:
 endif::openshift-rosa-hcp[]
 >>>>>>> 72fb79ab1d (Updated the HCP migration to include the ROSA Tutorals and Learning sections)
+=======
+. To see all the xref:../../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-aws-instance-types_rosa-service-definition[instance types available], run the following command:
+>>>>>>> e3ad7b9382 (OSDOCS-11269)
 +
 [source,terminal]
 ----