Moved files into upi and ipi folders, updated topic map

Author: bscott-rh

_topic_maps/_topic_map.yml

@@ -159,34 +159,42 @@ Topics:
     File: preparing-to-install-on-aws
   - Name: Configuring an AWS account
     File: installing-aws-account
-  - Name: Installing a cluster
-    File: installing-aws-default
-  - Name: Installing a cluster with customizations
-    File: installing-aws-customizations
-  - Name: Installing a cluster with network customizations
-    File: installing-aws-network-customizations
-  - Name: Installing a cluster in a restricted network
-    File: installing-restricted-networks-aws-installer-provisioned
-  - Name: Installing a cluster into an existing VPC
-    File: installing-aws-vpc
-  - Name: Installing a private cluster
-    File: installing-aws-private
-  - Name: Installing a cluster into a government region
-    File: installing-aws-government-region
-  - Name: Installing a cluster into a Secret or Top Secret Region
-    File: installing-aws-secret-region
-  - Name: Installing a cluster into a China region
-    File: installing-aws-china
-  - Name: Installing a cluster using CloudFormation templates
-    File: installing-aws-user-infra
-  - Name: Installing a cluster in a restricted network with user-provisioned infrastructure
-    File: installing-restricted-networks-aws
-  - Name: Installing a cluster with compute nodes on Local Zones
-    File: installing-aws-localzone
-  - Name: Installing a cluster with compute nodes on Wavelength Zones
-    File: installing-aws-wavelength-zone
-  - Name: Installing a cluster with compute nodes on Outposts
-    File: installing-aws-outposts
+  - Name: Installer-provisioned infrastructure
+    Dir: ipi
+    Distros: openshift-origin,openshift-enterprise
+    Topics:
+    - Name: Installing a cluster
+      File: installing-aws-default
+    - Name: Installing a cluster with customizations
+      File: installing-aws-customizations
+    - Name: Installing a cluster with network customizations
+      File: installing-aws-network-customizations
+    - Name: Installing a cluster in a restricted network
+      File: installing-restricted-networks-aws-installer-provisioned
+    - Name: Installing a cluster into an existing VPC
+      File: installing-aws-vpc
+    - Name: Installing a private cluster
+      File: installing-aws-private
+    - Name: Installing a cluster into a government region
+      File: installing-aws-government-region
+    - Name: Installing a cluster into a Secret or Top Secret Region
+      File: installing-aws-secret-region
+    - Name: Installing a cluster into a China region
+      File: installing-aws-china
+    - Name: Installing a cluster with compute nodes on Local Zones
+      File: installing-aws-localzone
+    - Name: Installing a cluster with compute nodes on Wavelength Zones
+      File: installing-aws-wavelength-zone
+    - Name: Installing a cluster with compute nodes on Outposts
+      File: installing-aws-outposts
+  - Name: User-provisioned infrastructure
+    Dir: upi
+    Distros: openshift-origin,openshift-enterprise
+    Topics:
+    - Name: Installing a cluster using CloudFormation templates
+      File: installing-aws-user-infra
+    - Name: Installing a cluster in a restricted network with user-provisioned infrastructure
+      File: installing-restricted-networks-aws
   - Name: Installing a three-node cluster
     File: installing-aws-three-node
   - Name: Uninstalling a cluster

installing/installing_aws/ipi/_attributes

@@ -0,0 +1 @@
+../../../_attributes

installing/installing_aws/ipi/images

@@ -0,0 +1 @@
+../../../images