rearranging the installation doc

_topic_map.yml

@@ -54,18 +54,21 @@ Topics:
 - Name: Working with projects
   File: working-with-projects
 ---
-Name: Installing clusters on AWS
-Dir: installing-aws
+Name: Installing
+Dir: installing
 Distros: openshift-origin, openshift-enterprise
 Topics:
-- Name: Configuring an AWS account
-  File: installing-aws-account
-- Name: Installing a cluster quickly on AWS
-  File: installing-quickly-cloud
-- Name: Installing a cluster on AWS with customizations
-  File: installing-customizations-cloud
-- Name: Uninstalling a cluster on AWS
-  File: uninstalling-cluster-aws
+- Name: Installing on AWS
+  Dir: installing_aws
+  Topics:
+  - Name: Configuring an AWS account
+    File: installing-aws-account
+  - Name: Installing a cluster quickly on AWS
+    File: installing-aws-default
+  - Name: Installing a cluster on AWS with customizations
+    File: installing-aws-customizations
+  - Name: Uninstalling a cluster on AWS
+    File: uninstalling-cluster-aws
 ---
 Name: Applications
 Dir: applications

installing/installing_aws/installing-aws-account.adoc

@@ -21,6 +21,6 @@ include::modules/installation-aws-regions.adoc[leveloffset=+1]
 .Next steps
 
 * Install a {product-title} cluster. You can
-xref:../installing-aws/installing-customizations-cloud.adoc#installing-customizations-cloud[install a customized cluster]
-or xref:../installing-aws/installing-quickly-cloud.adoc#installing-quickly-cloud[quickly install a cluster]
+xref:../../installing/installing_aws/installing-aws-customizations.adoc#installing-aws-customizations[install a customized cluster]
+or xref:../../installing/installing_aws/installing-aws-default.adoc#installing-aws-default[quickly install a cluster]
 with default options.

installing/installing_aws/installing-aws-customizations.adoc

@@ -1,4 +1,4 @@
-[id='installing-customizations-cloud']
+[id='installing-aws-customizations']
 = Installing a cluster on AWS with customizations
 include::modules/common-attributes.adoc[]
 :context: install-customizations-cloud
@@ -10,7 +10,7 @@ cluster on Amazon Web Services (AWS).
 
 .Prerequisites
 
-* xref:../installing-aws/installing-aws-account.adoc#installing-aws-account[Configure an AWS account]
+* xref:../../installing/installing_aws/installing-aws-account.adoc#installing-aws-account[Configure an AWS account]
 to host the cluster.
 
 include::modules/installation-overview.adoc[leveloffset=+1]
@@ -29,7 +29,7 @@ include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 
-include::modules/installing-customizations-cloud.adoc[leveloffset=+1]
+include::modules/installing-aws-customizations.adoc[leveloffset=+1]
 
 include::modules/cli-install.adoc[leveloffset=+1]
 

installing/installing_aws/installing-aws-default.adoc

@@ -1,7 +1,7 @@
-[id='installing-quickly-cloud']
+[id='installing-aws-default']
 = Installing a cluster quickly on AWS
 include::modules/common-attributes.adoc[]
-:context: installing-quickly-cloud
+:context: installing-aws-default
 
 toc::[]
 
@@ -10,7 +10,7 @@ Amazon Web Services (AWS) that uses the default configuration options.
 
 .Prerequisites
 
-* xref:../installing-aws/installing-aws-account.adoc#installing-aws-account[Configure an AWS account]
+* xref:../../installing/installing_aws/installing-aws-account.adoc#installing-aws-account[Configure an AWS account]
 to host the cluster.
 
 include::modules/installation-overview.adoc[leveloffset=+1]

modules/cli-install.adoc

@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-customizations-cloud.adoc
-// * installing-aws/installing-quickly-cloud.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
+// * installing/installing_aws/installing-aws-default.adoc
 
 [id='cli-install-{context}']
 = Installing the {product-title} CLI

modules/cli-logging-in-kubeadmin.adoc

@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-quickly-cloud.adoc
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-default.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 
 [id='cli-logging-in-kubeadmin-{context}']
 = Logging into the cluster as the `kubeadmin` user by using the `oc` CLI

modules/installation-aws-config-yaml.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 
 [id='installation-aws-config-yaml-{context}']
 = Sample customized `install-config.yaml` file for AWS

modules/installation-aws-iam-user.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-aws-account.adoc
+// * installing/installing_aws/installing-aws-account.adoc
 
 [id='installing-aws-iam-user-{context}']
 = Creating an IAM user

modules/installation-aws-limits.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-aws-account.adoc
+// * installing/installing_aws/installing-aws-account.adoc
 
 [id='installing-aws-limits-{context}']
 = AWS account limits

modules/installation-aws-regions.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-aws-account.adoc
+// * installing/installing_aws/installing-aws-account.adoc
 
 [id='installation-aws-regions-{context}']
 = Supported AWS regions

modules/installation-aws-route53.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-aws-account.adoc
+// * installing/installing_aws/installing-aws-account.adoc
 
 [id='installing-aws-route53-{context}']
 = Configuring Route53

modules/installation-clouds.adoc

@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-quickly-cloud.adoc
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-default.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 
 [id='cloud-installations-{context}']
 = {product-title} clusters on Installer Provisioned Infrastructure

modules/installation-configuration-parameters.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 // Consider also adding the installation-configuration-parameters.adoc module.
 
 

modules/installation-customizing.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 
 
 [id='installation-customizing-{context}']

modules/installation-initializing.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 // Consider also adding the installation-configuration-parameters.adoc module.
 
 [id='installation-initializing-{context}']

modules/installation-launching-installer.adoc

@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-quickly-cloud.adoc
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-default.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 // If you use this module in any other assembly, you must update the ifeval
 // statements.
 
@@ -30,7 +30,7 @@ $ ./openshift-install create cluster --dir=<directory> <1>
 ifeval::["{context}" == "install-customizations-cloud"]
 Specify the location of your customized `./install-config.yaml` file.
 endif::[]
-ifeval::["{context}" == "installing-quickly-cloud"]
+ifeval::["{context}" == "installing-aws-default"]
 <1> Specify the directory name to store the files that the installation program
 creates.
 +

modules/installation-obtaining-installer.adoc

@@ -1,10 +1,10 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-quickly-cloud.adoc
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-default.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 
 
-[id='installing-quickly-cloud-{context}']
+[id='installing-aws-default-{context}']
 = Obtaining the installation program
 
 Before you install {product-title} on a compatible cloud, download the

modules/installation-overview.adoc

@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-quickly-cloud.adoc
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-default.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 // * installing-byoh/installing-existing-hosts.adoc
 
 [id='installation-overview-{context}']

modules/installation-preparing-assets.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 
 
 [id='installation-preparing-assets-{context}']

modules/installation-preparing-custom.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 
 [id='installation-preparing-custom-{context}']
 = Preparing to install a custom {product-title} cluster

modules/installation-provide-credentials.adoc

@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-customizations-cloud.adoc
-// * installing-aws/installing-quickly-cloud.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
+// * installing/installing_aws/installing-aws-default.adoc
 
 [id='installation-provide-credentials-{context}']
 = Configuring your computer for installation

modules/installation-uninstall-aws.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/uninstalling-cluster-aws'adoc
+// * installing/installing_aws/uninstalling-cluster-aws'adoc
 
 [id='installation-uninstall-aws-{context}']
 = Removing a cluster from AWS

modules/installing-aws-customizations.adoc

@@ -1,8 +1,8 @@
 // Module included in the following assemblies:
 //
-// * installing-aws/installing-customizations-cloud.adoc
+// * installing/installing_aws/installing-aws-customizations.adoc
 
-[id='installing-customizations-cloud-{context}']
+[id='installing-aws-customizations-{context}']
 = Installation command options
 
 The installation program uses

welcome/index.adoc

@@ -29,9 +29,9 @@ As a cluster administrator, with tasks from deploying {product-title} 4.0 to man
 
 - **xref:../architecture/architecture.adoc#architecture-overview-architecture[Understand {product-title}]**: Learn how {product-title} 4.0 employs a foundation of Kubernetes that is installed and maintained through multiple levels of Operators. See how OpenShift masters and workers are managed and updated through xref:../architecture/architecture.adoc#machine-api-overview-architecture[Machine API] and xref:../applications/operators/olm-what-operators-are.adoc#machine-api-overview-architecture[Operators].
 
-- **xref:../installing-aws/installing-aws-account.adoc[Choose a deployment platform]**: Amazon AWS is the first supported platform for {product-title} 4.0. However, you can expect support for other cloud and on-premise platforms to follow soon.
+- **xref:../installing/installing_aws/installing-aws-account.adoc[Choose a deployment platform]**: Amazon AWS is the first supported platform for {product-title} 4.0. However, you can expect support for other cloud and on-premise platforms to follow soon.
 
-- **xref:../installing-aws/installing-aws-account.adoc[Deploy {product-title}]**: Choose between an xref:../installing-aws/installing-quickly-cloud.adoc[AWS quick cluster install] or xref:../installing-aws/installing-customizations-cloud.adoc[AWS install with customizations].
+- **xref:../installing/installing_aws/installing-aws-account.adoc[Deploy {product-title}]**: Choose between an xref:../installing/installing_aws/installing-aws-default.adoc[AWS quick cluster install] or xref:../installing/installing_aws/installing-aws-customizations.adoc[AWS install with customizations].
 
 - **xref:../machine_management/creating-machineset.adoc[Manage machines]**: Manage machines in your OpenShift cluster by xref:../machine_management/deploying-machine-health-checks.adoc[deploying health checks] and xref:../machine_management/deploying-machine-health-checks.adoc[applying autoscaling to machines].