Repaired the links in Introduction to ROSA book

Author: EricPonvelle

_topic_maps/_topic_map_rosa_hcp.yml

@@ -178,6 +178,8 @@ Name: Install ROSA with HCP clusters
 Dir: rosa_hcp
 Distros: openshift-rosa-hcp
 Topics:
+- Name: ROSA with HCP quick start guide
+  File: rosa-hcp-quickstart-guide
 - Name: Creating ROSA with HCP clusters using the default options
   File: rosa-hcp-sts-creating-a-cluster-quickly
 - Name: Creating ROSA with HCP clusters using a custom AWS KMS encryption key

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

@@ -13,13 +13,12 @@ toc::[]
 
 . A Provisioned ROSA cluster
 +
-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.
+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[]
 
 . The OpenShift Command Line Interface (CLI)
 +
@@ -34,3 +33,7 @@ endif::openshift-rosa-hcp[]
 . A GitHub Account
 +
 Use your existing GitHub account or register at link:https://github.com/signup[https://github.com/signup].
+
+include::modules/rosa-sts-understanding-aws-account-association.adoc[leveloffset=+2]
+[discrete]
+include::modules/rosa-sts-associating-your-aws-account.adoc[leveloffset=+2]

modules/rosa-getting-started-deleting-a-cluster.adoc

@@ -14,7 +14,12 @@ ifeval::["{context}" == "rosa-quickstart"]
 :quickstart:
 endif::[]
 
+ifdef::openshift-rosa-hcp[]
+You can delete a ROSA cluster by using the {product-title} (ROSA) CLI, `rosa`. You can also use the ROSA CLI to delete the AWS Identity and Access Management (IAM) account-wide roles, the cluster-specific Operator roles, and the OpenID Connect (OIDC) provider. To delete the account-wide inline and Operator policies, you can use the AWS IAM Console.
+endif::openshift-rosa-hcp[]
+ifndef::openshift-rosa-hcp[]
 You can delete a ROSA cluster that uses the AWS Security Token Service (STS) by using the {product-title} (ROSA) CLI, `rosa`. You can also use the ROSA CLI to delete the AWS Identity and Access Management (IAM) account-wide roles, the cluster-specific Operator roles, and the OpenID Connect (OIDC) provider. To delete the account-wide inline and Operator policies, you can use the AWS IAM Console.
+endif::openshift-rosa-hcp[]
 
 [IMPORTANT]
 ====
@@ -77,7 +82,13 @@ $ rosa delete account-roles --prefix <prefix> --mode auto <1>
 ----
 <1> You must include the `--<prefix>` argument. Replace `<prefix>` with the prefix of the account-wide roles to delete. If you did not specify a custom prefix when you created the account-wide roles, specify the default prefix, `ManagedOpenShift`.
 
+ifdef::openshift-rosa-hcp[]
+. Delete the account-wide inline and Operator IAM policies that you created for ROSA deployments:
+endif::openshift-rosa-hcp[]
+ifndef::openshift-rosa-hcp[]
 . Delete the account-wide inline and Operator IAM policies that you created for ROSA deployments that use STS:
+endif::openshift-rosa-hcp[]
++
 .. Log in to the link:https://console.aws.amazon.com/iamv2/home#/home[AWS IAM Console].
 .. Navigate to *Access management* -> *Policies* and select the checkbox for one of the account-wide policies.
 .. With the policy selected, click on *Actions* -> *Delete* to open the delete policy dialog.

modules/rosa-sts-overview-of-the-default-cluster-specifications.adoc

@@ -4,12 +4,6 @@
 // * rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc
 // * rosa_getting_started/rosa-quickstart-guide-ui.adoc
 
-ifeval::["{context}" == "rosa-hcp-sts-creating-a-cluster-quickly"]
-:rosa-hcp:
-endif::[]
-ifeval::["{context}" == "rosa-sts-creating-a-cluster-quickly"]
-:rosa-classic:
-endif::[]
 ifeval::["{context}" == "rosa-classic-creating-a-cluster-quickly-terraform"]
 :tf-classic:
 endif::[]
@@ -23,21 +17,21 @@ endif::[]
 
 ifndef::tf-classic,tf-hcp[]
 You can quickly create a
-ifdef::rosa-hcp[]
-{hcp-title}
-endif::rosa-hcp[]
-ifndef::rosa-hcp[]
-{product-title} (ROSA)
-endif::rosa-hcp[]
-cluster with the {sts-first} by using the default installation options. The following summary describes the default cluster specifications.
+ifdef::openshift-rosa-hcp[]
+{product-title} cluster by using the default installation options.
+endif::openshift-rosa-hcp[]
+ifdef::openshift-rosa[]
+{product-title} (ROSA) cluster with the {sts-first} by using the default installation options.
+endif::openshift-rosa[]
+The following summary describes the default cluster specifications.
 endif::tf-classic,tf-hcp[]
 
-ifdef::rosa-hcp[]
-.Default {hcp-title} cluster specifications
-endif::rosa-hcp[]
-ifdef::rosa-classic[]
+ifdef::openshift-rosa-hcp[]
+.Default {product-title} cluster specifications
+endif::openshift-rosa-hcp[]
+ifdef::openshift-rosa[]
 .Default ROSA with STS cluster specifications
-endif::rosa-classic[]
+endif::openshift-rosa[]
 
 [cols=".^1,.^3a",options="header"]
 |===
@@ -66,13 +60,13 @@ ifdef::tf-classic,tf-hcp[]
 endif::tf-classic,tf-hcp[]
 ifndef::tf-classic,tf-hcp[]
 * Default cluster version: Latest
-ifndef::rosa-hcp[]
+ifdef::openshift-rosa[]
 * Default AWS region for installations using the {cluster-manager-first} {hybrid-console-second}: us-east-1 (US East, North Virginia)
-endif::rosa-hcp[]
-ifdef::rosa-hcp[]
+endif::openshift-rosa[]
+ifdef::openshift-rosa-hcp[]
 * Default AWS region for installations using the ROSA CLI (`rosa`): Defined by your `aws` CLI configuration
 * Default EC2 IMDS endpoints (both v1 and v2) are enabled
-endif::rosa-hcp[]
+endif::openshift-rosa-hcp[]
 * Availability: Single zone for the data plane
 endif::tf-classic,tf-hcp[]
 ifndef::rosa-hcp,tf-hcp[]
@@ -83,22 +77,22 @@ endif::rosa-hcp,tf-hcp[]
 |Encryption
 |* Cloud storage is encrypted at rest
 * Additional etcd encryption is not enabled
-ifndef::rosa-hcp,tf-hcp[]
+ifdef::openshift-rosa,tf-classic[]
 * The default AWS Key Management Service (KMS) key is used as the encryption key for persistent data
-endif::rosa-hcp,tf-hcp[]
-ifdef::rosa-hcp,tf-hcp[]
-* AWS Key Management Service (KMS) key encryption is not enabled by default.
-endif::rosa-hcp,tf-hcp[]
+endif::openshift-rosa,tf-classic[]
+ifdef::openshift-rosa-hcp,tf-hcp[]
+* AWS Key Management Service (KMS) key encryption is not enabled by default
+endif::openshift-rosa-hcp,tf-hcp[]
 
-ifndef::rosa-hcp,tf-hcp[]
+ifdef::openshift-rosa,tf-classic[]
 |Control plane node configuration
 |* Control plane node instance type: m5.2xlarge (8 vCPU, 32 GiB RAM)
 * Control plane node count: 3
 
 |Infrastructure node configuration
 |* Infrastructure node instance type: r5.xlarge (4 vCPU, 32 GiB RAM)
 * Infrastructure node count: 2
-endif::rosa-hcp,tf-hcp[]
+endif::openshift-rosa,tf-classic[]
 
 |Compute node machine pool
 |* Compute node instance type: m5.xlarge (4 vCPU 16, GiB RAM)
@@ -120,9 +114,9 @@ ifdef::tf-classic,tf-hcp[]
 * Cluster privacy: public or private
 * You can choose to create a new VPC during the Terraform cluster creation process.
 endif::tf-classic,tf-hcp[]
-ifdef::rosa-hcp[]
+ifdef::openshift-rosa[]
 * You must have configured your own Virtual Private Cloud (VPC)
-endif::rosa-hcp[]
+endif::openshift-rosa[]
 * No cluster-wide proxy is configured
 
 |Classless Inter-Domain Routing (CIDR) ranges
@@ -139,12 +133,12 @@ ifndef::tf-classic,tf-hcp[]
 endif::tf-classic,tf-hcp[]
 * Host prefix: /23
 +
-ifdef::rosa-hcp[]
+ifdef::openshift-rosa-hcp[]
 [NOTE]
 ====
-When using {hcp-title}, the static IP address `172.20.0.1` is reserved for the internal Kubernetes API address. The machine, pod, and service CIDRs ranges must not conflict with this IP address.
+The static IP address `172.20.0.1` is reserved for the internal Kubernetes API address. The machine, pod, and service CIDRs ranges must not conflict with this IP address.
 ====
-endif::rosa-hcp[]
+endif::openshift-rosa-hcp[]
 
 |Cluster roles and policies
 |* Mode used to create the Operator roles and the OpenID Connect (OIDC) provider: `auto`
@@ -166,12 +160,6 @@ endif::tf-classic,tf-hcp[]
 
 |===
 
-ifeval::["{context}" == "rosa-hcp-sts-creating-a-cluster-quickly"]
-:!rosa-hcp:
-endif::[]
-ifeval::["{context}" == "rosa-sts-creating-a-cluster-quickly"]
-:!rosa-classic:
-endif::[]
 ifeval::["{context}" == "rosa-classic-creating-a-cluster-quickly-terraform"]
 :!tf-classic:
 endif::[]

nodes/index.adoc

@@ -34,13 +34,13 @@ image::295_OpenShift_Nodes_Overview_1222.png[Overview of control plane and worke
 
 The read operations allow an administrator or a developer to get information about nodes in an {product-title} cluster.
 
-ifndef::openshift-rosa-hcp,openshift-rosa[]
+ifndef::openshift-enterprise,openshift-rosa-hcp,openshift-rosa[]
 * xref:../nodes/nodes/nodes-nodes-viewing.adoc#nodes-nodes-viewing-listing_nodes-nodes-viewing[List all the nodes in a cluster].
 * Get information about a node, such as memory and CPU usage, health, status, and age.
 * xref:../nodes/nodes/nodes-nodes-viewing.adoc#nodes-nodes-viewing-listing-pods_nodes-nodes-viewing[List pods running on a node].
-endif::openshift-rosa-hcp,openshift-rosa[]
+endif::openshift-enterprise,openshift-rosa-hcp,openshift-rosa[]
 
-ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
+ifndef::openshift-enterprise,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 [discrete]
 === Management operations
 
@@ -54,24 +54,24 @@ through several tasks:
 * xref:../nodes/nodes/nodes-nodes-managing-max-pods.adoc#nodes-nodes-managing-max-pods-proc_nodes-nodes-managing-max-pods[Configure the number of pods that can run on a node] based on the number of processor cores on the node, a hard limit, or both.
 * Reboot a node gracefully using xref:../nodes/nodes/nodes-nodes-rebooting.adoc#nodes-nodes-rebooting-affinity_nodes-nodes-rebooting[pod anti-affinity].
 * xref:../nodes/nodes/nodes-nodes-working.adoc#deleting-nodes[Delete a node from a cluster] by scaling down the cluster using a compute machine set. To delete a node from a bare-metal cluster, you must first drain all pods on the node and then manually delete the node.
-endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
+endif::openshift-enterprise,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 
 [discrete]
 === Enhancement operations
 
 {product-title} allows you to do more than just access and manage nodes; as an administrator, you can perform the following tasks on nodes to make the cluster more efficient, application-friendly, and to provide a better environment for your developers.
 
 * Manage node-level tuning for high-performance applications that require some level of kernel tuning by 
-ifndef::openshift-rosa-hcp,openshift-rosa[]
+ifndef::openshift-enterprise,openshift-rosa-hcp,openshift-rosa[]
 xref:../nodes/nodes/nodes-node-tuning-operator.adoc#nodes-node-tuning-operator[using the Node Tuning Operator].
 * xref:../nodes/jobs/nodes-pods-daemonsets.adoc#nodes-pods-daemonsets[Run background tasks on nodes automatically with daemon sets]. You can create and use daemon sets to create shared storage, run a logging pod on every node, or deploy a monitoring agent on all nodes.
-endif::openshift-rosa-hcp,openshift-rosa[]
-ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
+endif::openshift-enterprise,openshift-rosa-hcp,openshift-rosa[]
+ifndef::openshift-enterprise,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 * Enable TLS security profiles on the node to protect communication between the kubelet and the Kubernetes API server.
 * xref:../nodes/nodes/nodes-nodes-garbage-collection.adoc#nodes-nodes-garbage-collection[Free node resources using garbage collection]. You can ensure that your nodes are running efficiently by removing terminated containers and the images not referenced by any running pods.
 * xref:../nodes/nodes/nodes-nodes-managing.adoc#nodes-nodes-kernel-arguments_nodes-nodes-managing[Add kernel arguments to a set of nodes].
 * Configure an {product-title} cluster to have worker nodes at the network edge (remote worker nodes). For information on the challenges of having remote worker nodes in an {product-title} cluster and some recommended approaches for managing pods on a remote worker node, see xref:../nodes/edge/nodes-edge-remote-workers.adoc#nodes-edge-remote-workers[Using remote worker nodes at the network edge].
-endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
+endif::openshift-enterprise,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
 ifdef::openshift-rosa-hcp,openshift-rosa[]
 * link:https://docs.openshift.com/rosa/nodes/jobs/nodes-pods-daemonsets.html#nodes-pods-daemonsets[Run background tasks on nodes automatically with daemon sets]. You can create and use daemon sets to create shared storage, run a logging pod on every node, or deploy a monitoring agent on all nodes.
 endif::openshift-rosa-hcp,openshift-rosa[]