OSDOCS-15910: Pruning HCP Cluster Installation

Author: EricPonvelle

_topic_maps/_topic_map_rosa.yml

@@ -247,31 +247,6 @@ Topics:
 - Name: Setting up your environment
   File: rosa-sts-setting-up-environment
 ---
-Name: Install ROSA with HCP clusters
-Dir: rosa_hcp
-Distros: openshift-rosa
-Topics:
-- Name: Creating ROSA with HCP clusters using the default options
-  File: rosa-hcp-sts-creating-a-cluster-quickly
-- Name: Creating a ROSA cluster using Terraform
-  Dir: terraform
-  Distros: openshift-rosa
-  Topics:
-  - Name: Creating a default ROSA cluster using Terraform
-    File: rosa-hcp-creating-a-cluster-quickly-terraform
-- Name: Creating ROSA with HCP clusters using a custom AWS KMS encryption key
-  File: rosa-hcp-creating-cluster-with-aws-kms-key
-- Name: Creating a private cluster on ROSA with HCP
-  File: rosa-hcp-aws-private-creating-cluster
-- Name: Creating ROSA with HCP clusters with egress zero
-  File: rosa-hcp-egress-zero-install
-- Name: Creating a ROSA with HCP cluster that uses direct authentication with an external OIDC identity provider
-  File: rosa-hcp-sts-creating-a-cluster-ext-auth
-- Name: Creating ROSA with HCP clusters without a CNI plugin
-  File: rosa-hcp-cluster-no-cni
-- Name: Deleting a ROSA with HCP cluster
-  File: rosa-hcp-deleting-cluster
----
 Name: Install ROSA Classic clusters
 Dir: rosa_install_access_delete_clusters
 Distros: openshift-rosa

_topic_maps/_topic_map_rosa_hcp.yml

@@ -178,33 +178,33 @@ Topics:
 - Name: Planning resource usage in your cluster
   File: rosa-planning-environment
 ---
-Name: Install ROSA with HCP clusters
+Name: Install  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
+# - Name: ROSA quick start guide
+#   File: rosa-hcp-quickstart-guide
+- Name: Creating ROSA clusters using the default options
   File: rosa-hcp-sts-creating-a-cluster-quickly
 - Name: Creating a ROSA cluster using Terraform
   Dir: terraform
   Distros: openshift-rosa-hcp
   Topics:
   - Name: Creating a default ROSA cluster using Terraform
     File: rosa-hcp-creating-a-cluster-quickly-terraform
-- Name: Creating ROSA with HCP clusters using a custom AWS KMS encryption key
-  File: rosa-hcp-creating-cluster-with-aws-kms-key
-- Name: Configuring a shared virtual private cloud for ROSA with HCP clusters
+# - Name: Creating ROSA clusters using a custom AWS KMS encryption key
+#   File: rosa-hcp-creating-cluster-with-aws-kms-key
+- Name: Configuring a shared virtual private cloud for ROSA clusters
   File: rosa-hcp-shared-vpc-config
-- Name: Creating a private cluster on ROSA with HCP
+- Name: Creating a private cluster on ROSA
   File: rosa-hcp-aws-private-creating-cluster
-- Name: Creating ROSA with HCP clusters with egress zero
+- Name: Creating ROSA clusters with egress zero
   File: rosa-hcp-egress-zero-install
-- Name: Creating a ROSA with HCP cluster that uses direct authentication with an external OIDC identity provider
+- Name: Creating a ROSA cluster that uses direct authentication with an external OIDC identity provider
   File: rosa-hcp-sts-creating-a-cluster-ext-auth
-- Name: Creating ROSA with HCP clusters without a CNI plugin
-  File: rosa-hcp-cluster-no-cni
-- Name: Deleting a ROSA with HCP cluster
+# - Name: Creating ROSA clusters without a CNI plugin
+#   File: rosa-hcp-cluster-no-cni
+- Name: Deleting a ROSA cluster
   File: rosa-hcp-deleting-cluster
 ---
 Name: Web console
@@ -397,8 +397,6 @@ Topics:
 #    File: troubleshooting-installations
   - Name: Review your cluster notifications
     File: mos-tshoot-cluster-notifications
-#  - Name: Troubleshooting ROSA installations
-#    File: rosa-troubleshooting-installations
   - Name: Troubleshooting Red Hat OpenShift Service on AWS installations
     File: rosa-troubleshooting-installations-hcp
   - Name: Troubleshooting networking

cloud_experts_tutorials/cloud-experts-custom-dns-resolver.adoc

@@ -20,7 +20,12 @@ This tutorial uses the open-source BIND DNS server (`named`) to demonstrate the
 
 * ROSA CLI (`rosa`)
 * AWS CLI (`aws`)
-* A xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-vpc-manual_rosa-hcp-sts-creating-a-cluster-quickly[manually created AWS VPC]
+ifdef::openshift-rosa[]
+* A manually created AWS VPC
+endif::openshift-rosa[]
+ifdef::openshift-rosa-hcp[]
+* A xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-creating-vpc_rosa-hcp-sts-creating-a-cluster-quickly[manually created AWS VPC]
+endif::openshift-rosa-hcp[]
 * A DHCP option set configured to point to a custom DNS server and set as the default for your VPC
 
 [id="cloud-experts-custom-dns-resolver-environment-setup"]

cloud_experts_tutorials/cloud-experts-rosa-hcp-activation-and-account-linking-tutorial.adoc

@@ -171,7 +171,12 @@ image::rosa-create-cli-billing-17.png[]
 
 .Additional resources 
 
-* The detailed cluster deployment steps are beyond the scope of this tutorial. See xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[Creating {hcp-title} clusters using the default options] for more details about how to complete the {hcp-title} cluster deployment using the CLI.
+ifdef::openshift-rosa-hcp[]
+* The detailed cluster deployment steps are beyond the scope of this tutorial. See xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-quickly[Creating {product-title} clusters using the default options] for more details about how to complete the {product-title} cluster deployment using the CLI.
+endif::openshift-rosa-hcp[]
+ifdef::openshift-rosa[]
+* The detailed cluster deployment steps are beyond the scope of this tutorial.
+endif::openshift-rosa[]
 
 == Selecting the AWS billing account for {hcp-title} during cluster deployment using the web console
 
@@ -220,5 +225,7 @@ The following steps past the billing AWS account selection are beyond the scope
 
 .Additional resources
 
+ifdef::openshift-rosa-hcp[]
 * For information on using the CLI to create a cluster, see xref:../rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc#rosa-hcp-sts-creating-a-cluster-cli_rosa-hcp-sts-creating-a-cluster-quickly[Creating a {hcp-title} cluster using the CLI].
+endif::openshift-rosa-hcp[]
 * See link:https://cloud.redhat.com/learning/learn:getting-started-red-hat-openshift-service-aws-rosa/resource/resources:how-deploy-cluster-red-hat-openshift-service-aws-using-console-ui[this learning path] for more details on how to complete ROSA cluster deployment using the web console.

modules/rosa-additional-principals-create.adoc

@@ -5,7 +5,7 @@
 
 :_mod-docs-content-type: PROCEDURE
 [id="rosa-additional-principals-create_{context}"]
-= Adding additional principals while creating your {hcp-title} cluster
+= Adding additional principals while creating your {product-title} cluster
 
 Use the `--additional-allowed-principals` argument to permit access through other roles.
 

modules/rosa-additional-principals-edit.adoc

@@ -5,7 +5,7 @@
 
 :_mod-docs-content-type: PROCEDURE
 [id="rosa-additional-principals-edit_{context}"]
-= Adding additional principals to your existing {hcp-title} cluster
+= Adding additional principals to your existing {product-title} cluster
 
 You can add additional principals to your cluster by using the command-line interface (CLI).
 

modules/rosa-additional-principals-overview.adoc

@@ -4,17 +4,17 @@
 
 :_mod-docs-content-type: CONCEPT
 [id="rosa-additional-principals-overview_{context}"]
-= Additional principals on your {hcp-title} cluster
+= Additional principals on your {product-title} cluster
 
 You can allow AWS Identity and Access Management (IAM) roles as additional principals to connect to your cluster's private API server endpoint.
 
-You can access your {hcp-title} cluster's API Server endpoint from either the public internet or the interface endpoint that was created within the VPC private subnets. By default, you can privately access your {hcp-title} API Server by using the `-kube-system-kube-controller-manager` Operator role. To be able to access ROSA with HCP API server from another account directly without using the primary account where cluster is installed, you must include cross-account IAM roles as additional principals. This feature allows you to simplify your network architecture and reduce data transfer costs by avoiding peering or attaching cross-account VPCs to cluster's VPC.
+You can access your {product-title} cluster's API Server endpoint from either the public internet or the interface endpoint that was created within the VPC private subnets. By default, you can privately access your {product-title} API Server by using the `-kube-system-kube-controller-manager` Operator role. To be able to access {product-title} API server from another account directly without using the primary account where cluster is installed, you must include cross-account IAM roles as additional principals. This feature allows you to simplify your network architecture and reduce data transfer costs by avoiding peering or attaching cross-account VPCs to cluster's VPC.
 
 image::AWS_cross_account_access.png[Overview of AWS cross account access]
 
 In this diagram, the cluster creating account is designated as Account A. This account designates that another account, Account B, should have access to the API server.
 
 [NOTE]
 ====
-After you have configured additional allowed principals, you must create the interface VPC endpoint in the VPC from where you want to access the cross-account {hcp-title} API server. Then, create a private hosted zone in Route53 to route calls made to cross-account {hcp-title} API server to pass through the created VPC endpoint.
+After you have configured additional allowed principals, you must create the interface VPC endpoint in the VPC from where you want to access the cross-account {product-title} API server. Then, create a private hosted zone in Route53 to route calls made to cross-account {product-title} API server to pass through the created VPC endpoint.
 ====

modules/rosa-deleting-account-wide-iam-roles-and-policies.adoc

@@ -15,32 +15,11 @@ endif::[]
 [id="rosa-deleting-account-wide-iam-roles-and-policies_{context}"]
 = Deleting the account-wide IAM roles and policies
 
-This section provides steps to delete the account-wide IAM roles and policies that you created for
-ifdef::sts[]
-{rosa-classic-short} with STS
-endif::sts[]
-ifdef::hcp[]
-{rosa-short}
-endif::hcp[]
-deployments, along with the account-wide Operator policies. You can delete the account-wide AWS Identity and Access Management (IAM) roles and policies only after deleting all of the
-ifdef::sts[]
-{rosa-classic-short} with AWS Security Token Services (STS)
-endif::sts[]
-ifdef::hcp[]
-{rosa-short}
-endif::hcp[]
-clusters that depend on them.
+This section provides steps to delete the account-wide IAM roles and policies that you created for {product-title} deployments, along with the account-wide Operator policies. You can delete the account-wide AWS Identity and Access Management (IAM) roles and policies only after deleting all of the {product-title} clusters that depend on them.
 
 [IMPORTANT]
 ====
-The account-wide IAM roles and policies might be used by other
-ifdef::sts[]
-{rosa-classic-short}
-endif::sts[]
-ifdef::hcp[]
-{rosa-short}
-endif::hcp[]
-clusters in the same AWS account. Only remove the roles if they are not required by other clusters.
+The account-wide IAM roles and policies might be used by other {product-title} clusters in the same AWS account. Only remove the roles if they are not required by other clusters.
 ====
 
 .Prerequisites
@@ -101,7 +80,7 @@ $ rosa delete account-roles --prefix <prefix> --delete-hosted-shared-vpc-policie
 +
 [IMPORTANT]
 ====
-The account-wide IAM roles might be used by other ROSA clusters in the same AWS account. Only remove the roles if they are not required by other clusters.
+The account-wide IAM roles might be used by other {product-title} clusters in the same AWS account. Only remove the roles if they are not required by other clusters.
 ====
 +
 ifdef::hcp[]
@@ -132,12 +111,5 @@ If you did not specify a custom prefix when you created the account-wide roles,
 +
 [IMPORTANT]
 ====
-The account-wide and Operator IAM policies might be used by other
-ifdef::sts[]
-{rosa-classic-short}
-endif::sts[]
-ifdef::hcp[]
-{rosa-short}
-endif::hcp[]
-clusters in the same AWS account. Only remove the roles if they are not required by other clusters.
+The account-wide and Operator IAM policies might be used by other {product-title} clusters in the same AWS account. Only remove the roles if they are not required by other clusters.
 ====

modules/rosa-deleting-sts-iam-resources-account-wide.adoc

@@ -11,48 +11,13 @@ endif::[]
 [id="rosa-deleting-sts-resources-account-wide_{context}"]
 = Deleting the account-wide IAM resources
 
-After you have deleted all 
-ifndef::hcp[]
-{product-title} (ROSA) with AWS Security Token Services (STS) 
-endif::hcp[]
-ifdef::hcp[]
-{rosa-short} 
-endif::hcp[]
-clusters that depend on the account-wide AWS Identity and Access Management (IAM) resources, you can delete the account-wide resources.
+After you have deleted all {product-title} clusters that depend on the account-wide AWS Identity and Access Management (IAM) resources, you can delete the account-wide resources.
 
-If you no longer need to install a 
-ifndef::hcp[]
-{rosa-classic-short} with STS 
-endif::hcp[]
-ifdef::hcp[]
-{rosa-short} 
-endif::hcp[]
-cluster by using {cluster-manager-first}, you can also delete the {cluster-manager} and user IAM roles.
+If you no longer need to install a {product-title} cluster by using {cluster-manager-first}, you can also delete the {cluster-manager} and user IAM roles.
 
 [IMPORTANT]
 ====
-The account-wide IAM roles and policies might be used by other 
-ifndef::hcp[]
-{rosa-classic-short} 
-endif::hcp[]
-ifdef::hcp[]
-{rosa-short} 
-endif::hcp[]
-clusters in the same AWS account. Only remove the resources if they are not required by other clusters.
+The account-wide IAM roles and policies might be used by other {product-title} clusters in the same AWS account. Only remove the resources if they are not required by other clusters.
 
-The {cluster-manager} and user IAM roles are required if you want to install, manage, and delete other 
-ifndef::hcp[]
-{rosa-classic-short} 
-endif::hcp[]
-ifdef::hcp[]
-{rosa-short} 
-endif::hcp[]
-clusters in the same AWS account by using {cluster-manager}. Only remove the roles if you no longer need to install 
-ifndef::hcp[]
-{rosa-classic-short} 
-endif::hcp[]
-ifdef::hcp[]
-{rosa-short} 
-endif::hcp[]
-clusters in your account by using {cluster-manager}. For more information about repairing your cluster if these roles are removed before deletion, see "Repairing a cluster that cannot be deleted" in _Troubleshooting cluster deployments_.
+The {cluster-manager} and user IAM roles are required if you want to install, manage, and delete other {product-title} clusters in the same AWS account by using {cluster-manager}. Only remove the roles if you no longer need to install {product-title} clusters in your account by using {cluster-manager}. For more information about repairing your cluster if these roles are removed before deletion, see "Repairing a cluster that cannot be deleted" in _Troubleshooting cluster deployments_.
 ====

modules/rosa-hcp-aws-private-create-cluster.adoc

@@ -3,14 +3,14 @@
 // * rosa_hcp/rosa-hcp-aws-private-creating-cluster.adoc
 :_mod-docs-content-type: PROCEDURE
 [id="rosa-hcp-aws-private-create-cluster_{context}"]
-= Creating a private {hcp-title} cluster using the ROSA CLI
+= Creating a private {product-title} cluster using the ROSA CLI
 
-You can create a private cluster with multiple availability zones (Multi-AZ) on {hcp-title} using the ROSA command-line interface (CLI), `rosa`.
+You can create a private cluster with multiple availability zones (Multi-AZ) on {product-title} using the ROSA command-line interface (CLI), `rosa`.
 
 .Prerequisites
 
 * You have available AWS service quotas.
-* You have enabled the ROSA service in the AWS Console.
+* You have enabled the {product-title} in the AWS Console.
 * You have installed and configured the latest version of the ROSA CLI on your installation host.
 
 .Procedure