OSDOCS#10085 reorganizing AWS installation requirements

Author: bscott-rh

_topic_maps/_topic_map.yml

@@ -155,14 +155,16 @@ Topics:
   Dir: installing_aws
   Distros: openshift-origin,openshift-enterprise
   Topics:
-  - Name: Preparing to install
+  - Name: Installation methods
     File: preparing-to-install-on-aws
   - Name: Configuring an AWS account
     File: installing-aws-account
   - Name: Installer-provisioned infrastructure
     Dir: ipi
     Distros: openshift-origin,openshift-enterprise
     Topics:
+    - Name: Preparing to install a cluster
+      File: ipi-aws-preparing-to-install
     - Name: Installing a cluster
       File: installing-aws-default
     - Name: Installing a cluster with customizations

installing/installing_aws/ipi/installing-aws-china.adoc

@@ -26,20 +26,14 @@ If you have an AWS profile stored on your computer, it must not use a temporary
 
 include::modules/installation-aws-regions-with-no-ami.adoc[leveloffset=+1]
 
-include::modules/cluster-entitlements.adoc[leveloffset=+1]
-
 include::modules/private-clusters-default.adoc[leveloffset=+1]
 include::modules/private-clusters-about-aws.adoc[leveloffset=+2]
 
 include::modules/installation-custom-aws-vpc.adoc[leveloffset=+1]
 include::modules/installation-aws-security-groups.adoc[leveloffset=+2]
 
-include::modules/ssh-agent-using.adoc[leveloffset=+1]
-
 include::modules/installation-aws-upload-custom-rhcos-ami.adoc[leveloffset=+1]
 
-include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
-
 include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
@@ -61,9 +55,6 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-applying-aws-security-groups.adoc[leveloffset=+2]
 
-//Installing the OpenShift CLI by downloading the binary: Moved up to precede `ccoctl` steps, which require the use of `oc`
-include::modules/cli-installing-cli.adoc[leveloffset=+1]
-
 [id="installing-aws-manual-modes_{context}"]
 == Alternatives to storing administrator-level secrets in the kube-system project
 
@@ -110,13 +101,10 @@ include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
 
 include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1]
 
-include::modules/cluster-telemetry.adoc[leveloffset=+1]
-
 [role="_additional-resources"]
 .Additional resources
 
 * See xref:../../../web_console/web-console.adoc#web-console[Accessing the web console] for more details about accessing and understanding the {product-title} web console.
-* See xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service.
 
 == Next steps
 

installing/installing_aws/ipi/installing-aws-customizations.adoc

@@ -29,14 +29,8 @@ If you have an AWS profile stored on your computer, it must not use a temporary
 ====
 * If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
 
-include::modules/cluster-entitlements.adoc[leveloffset=+1]
-
-include::modules/ssh-agent-using.adoc[leveloffset=+1]
-
 include::modules/installation-aws-marketplace-subscribe.adoc[leveloffset=+1]
 
-include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
-
 include::modules/installation-initializing.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
@@ -58,9 +52,6 @@ include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
-//Installing the OpenShift CLI by downloading the binary: Moved up to precede `ccoctl` steps, which require the use of `oc`
-include::modules/cli-installing-cli.adoc[leveloffset=+1]
-
 [id="installing-aws-manual-modes_{context}"]
 == Alternatives to storing administrator-level secrets in the kube-system project
 
@@ -112,13 +103,6 @@ include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1]
 
 * See xref:../../../web_console/web-console.adoc#web-console[Accessing the web console] for more details about accessing and understanding the {product-title} web console.
 
-include::modules/cluster-telemetry.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* See xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service.
-
 == Next steps
 
 * xref:../../../installing/validating-an-installation.adoc#validating-an-installation[Validating an installation].

installing/installing_aws/ipi/installing-aws-default.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="installing-aws-default"]
-= Installing a cluster quickly on AWS
+= Installing a cluster on AWS
 include::_attributes/common-attributes.adoc[]
 :context: installing-aws-default
 
@@ -21,21 +21,13 @@ If you have an AWS profile stored on your computer, it must not use a temporary
 ====
 * If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
 
-include::modules/cluster-entitlements.adoc[leveloffset=+1]
-
-include::modules/ssh-agent-using.adoc[leveloffset=+1]
-
-include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
-
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
 
 * See link:https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html[Configuration and credential file settings] in the AWS documentation for more information about AWS profile and credential configuration.
 
-include::modules/cli-installing-cli.adoc[leveloffset=+1]
-
 include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
 
 include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1]
@@ -45,13 +37,6 @@ include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1]
 
 * See xref:../../../web_console/web-console.adoc#web-console[Accessing the web console] for more details about accessing and understanding the {product-title} web console.
 
-include::modules/cluster-telemetry.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* See xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service
-
 == Next steps
 
 * xref:../../../installing/validating-an-installation.adoc#validating-an-installation[Validating an installation].

installing/installing_aws/ipi/installing-aws-government-region.adoc

@@ -33,14 +33,8 @@ include::modules/private-clusters-about-aws.adoc[leveloffset=+2]
 include::modules/installation-custom-aws-vpc.adoc[leveloffset=+1]
 include::modules/installation-aws-security-groups.adoc[leveloffset=+2]
 
-include::modules/cluster-entitlements.adoc[leveloffset=+1]
-
-include::modules/ssh-agent-using.adoc[leveloffset=+1]
-
 include::modules/installation-aws-marketplace-subscribe.adoc[leveloffset=+1]
 
-include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
-
 include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
@@ -62,9 +56,6 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-applying-aws-security-groups.adoc[leveloffset=+2]
 
-//Installing the OpenShift CLI by downloading the binary: Moved up to precede `ccoctl` steps, which require the use of `oc`
-include::modules/cli-installing-cli.adoc[leveloffset=+1]
-
 [id="installing-aws-manual-modes_{context}"]
 == Alternatives to storing administrator-level secrets in the kube-system project
 
@@ -116,13 +107,6 @@ include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1]
 
 * See xref:../../../web_console/web-console.adoc#web-console[Accessing the web console] for more details about accessing and understanding the {product-title} web console.
 
-include::modules/cluster-telemetry.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* See xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service.
-
 == Next steps
 
 * xref:../../../installing/validating-an-installation.adoc#validating-an-installation[Validating an installation].

installing/installing_aws/ipi/installing-aws-localzone.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="installing-aws-localzone"]
-= Installing a cluster on AWS with compute nodes on AWS Local Zones
+= Installing a cluster with compute nodes on AWS Local Zones
 include::_attributes/common-attributes.adoc[]
 :context: installing-aws-localzone
 :zone-type: Local Zones
@@ -75,21 +75,9 @@ Before you install a cluster in an AWS {zone-type} environment, you must configu
 // Opting in to AWS Local Zones
 include::modules/installation-aws-add-zone-locations.adoc[leveloffset=+2]
 
-// Internet access for OpenShift Container Platform
-include::modules/cluster-entitlements.adoc[leveloffset=+2]
-
 // Obtaining an AWS Marketplace image
 include::modules/installation-aws-marketplace-subscribe.adoc[leveloffset=+2]
 
-//Installing the OpenShift CLI by downloading the binary: Moved up to precede `ccoctl` steps, which require the use of `oc`
-include::modules/cli-installing-cli.adoc[leveloffset=+2]
-
-// Obtaining the installation program
-include::modules/installation-obtaining-installer.adoc[leveloffset=+2]
-
-// Generating a key pair for cluster node SSH access
-include::modules/ssh-agent-using.adoc[leveloffset=+2]
-
 [id="prep-installation-aws-local-zone_{context}"]
 == Preparing for the installation
 
@@ -224,14 +212,6 @@ include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+2]
 // Verifying nodes that were created with edge compute pool
 include::modules/machine-edge-pool-review-nodes.adoc[leveloffset=+2]
 
-// Telemetry access for OpenShift Container Platform
-include::modules/cluster-telemetry.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]
-
 .Next steps
 
 //* xref:../../../post_installation_configuration/aws-compute-edge-zone-tasks#installation-extend-edge-nodes-aws-local-zones_aws-compute-edge-zone-tasks[Creating user workloads in AWS Local Zones or Wavelength Zones]

installing/installing_aws/ipi/installing-aws-network-customizations.adoc

@@ -27,14 +27,6 @@ cluster.
 If you have an AWS profile stored on your computer, it must not use a temporary session token that you generated while using a multi-factor authentication device. The cluster continues to use your current AWS credentials to create AWS resources for the entire life of the cluster, so you must use key-based, long-term credentials. To generate appropriate keys, see link:https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html[Managing Access Keys for IAM Users] in the AWS documentation. You can supply the keys when you run the installation program.
 ====
 * If you use a firewall, you xref:../../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
-// TODO
-// Concept that describes networking
-
-include::modules/cluster-entitlements.adoc[leveloffset=+1]
-
-include::modules/ssh-agent-using.adoc[leveloffset=+1]
-
-include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 
 include::modules/nw-network-config.adoc[leveloffset=+1]
 
@@ -58,9 +50,6 @@ include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
-//Installing the OpenShift CLI by downloading the binary: Moved up to precede `ccoctl` steps, which require the use of `oc`
-include::modules/cli-installing-cli.adoc[leveloffset=+1]
-
 [id="installing-aws-manual-modes_{context}"]
 == Alternatives to storing administrator-level secrets in the kube-system project
 
@@ -132,13 +121,6 @@ include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1]
 
 * See xref:../../../web_console/web-console.adoc#web-console[Accessing the web console] for more details about accessing and understanding the {product-title} web console.
 
-include::modules/cluster-telemetry.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* See xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service.
-
 == Next steps
 
 * xref:../../../installing/validating-an-installation.adoc#validating-an-installation[Validating an installation].

installing/installing_aws/ipi/installing-aws-outposts.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
 [id="installing-aws-outposts"]
-= Installing a cluster on AWS with compute nodes on AWS Outposts
+= Installing a cluster with compute nodes on AWS Outposts
 include::_attributes/common-attributes.adoc[]
 :context: installing-aws-outposts
 

installing/installing_aws/ipi/installing-aws-private.adoc

@@ -28,12 +28,6 @@ include::modules/private-clusters-about-aws.adoc[leveloffset=+2]
 include::modules/installation-custom-aws-vpc.adoc[leveloffset=+1]
 include::modules/installation-aws-security-groups.adoc[leveloffset=+2]
 
-include::modules/cluster-entitlements.adoc[leveloffset=+1]
-
-include::modules/ssh-agent-using.adoc[leveloffset=+1]
-
-include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
-
 include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
@@ -56,9 +50,6 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-applying-aws-security-groups.adoc[leveloffset=+2]
 
-//Installing the OpenShift CLI by downloading the binary: Moved up to precede `ccoctl` steps, which require the use of `oc`
-include::modules/cli-installing-cli.adoc[leveloffset=+1]
-
 [id="installing-aws-manual-modes_{context}"]
 == Alternatives to storing administrator-level secrets in the kube-system project
 
@@ -110,13 +101,6 @@ include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1]
 
 * See xref:../../../web_console/web-console.adoc#web-console[Accessing the web console] for more details about accessing and understanding the {product-title} web console.
 
-include::modules/cluster-telemetry.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-.Additional resources
-
-* See xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service.
-
 == Next steps
 
 * xref:../../../installing/validating-an-installation.adoc#validating-an-installation[Validating an installation].

installing/installing_aws/ipi/installing-aws-secret-region.adoc

@@ -36,14 +36,8 @@ include::modules/private-clusters-about-aws.adoc[leveloffset=+2]
 include::modules/installation-custom-aws-vpc.adoc[leveloffset=+1]
 include::modules/installation-aws-security-groups.adoc[leveloffset=+2]
 
-include::modules/cluster-entitlements.adoc[leveloffset=+1]
-
 include::modules/installation-aws-upload-custom-rhcos-ami.adoc[leveloffset=+1]
 
-include::modules/ssh-agent-using.adoc[leveloffset=+1]
-
-include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
-
 include::modules/installation-initializing-manual.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
@@ -55,9 +49,6 @@ include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 include::modules/installation-applying-aws-security-groups.adoc[leveloffset=+2]
 
-//Installing the OpenShift CLI by downloading the binary: Moved up to precede `ccoctl` steps, which require the use of `oc`
-include::modules/cli-installing-cli.adoc[leveloffset=+1]
-
 [id="installing-aws-manual-modes_{context}"]
 == Alternatives to storing administrator-level secrets in the kube-system project
 
@@ -109,13 +100,6 @@ include::modules/logging-in-by-using-the-web-console.adoc[leveloffset=+1]
 .Additional resources
 * xref:../../../web_console/web-console.adoc#web-console[Accessing the web console]
 
-include::modules/cluster-telemetry.adoc[leveloffset=+1]
-
-[role="_additional-resources"]
-[id="additional-resources_installing-aws-secret-region_telemetry"]
-.Additional resources
-* xref:../../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]
-
 [id="next-steps_installing-aws-secret-region"]
 == Next steps
 * xref:../../../installing/validating-an-installation.adoc#validating-an-installation[Validating an installation].