diff --git a/.s2i/httpd-cfg/01-commercial.conf b/.s2i/httpd-cfg/01-commercial.conf index b98fd399e6..27b89dfaec 100644 --- a/.s2i/httpd-cfg/01-commercial.conf +++ b/.s2i/httpd-cfg/01-commercial.conf @@ -234,6 +234,11 @@ AddType text/vtt vtt RewriteRule ^container-platform/(3\.7)/install_config/upgrades\.html(.*)$ /container-platform/$1/upgrading/index.html$2 [NE,R=301] RewriteRule ^container-platform/(3\.7)/install_config/upgrading/(.*)$ /container-platform/$1/upgrading/$2 [NE,R=301] RewriteRule ^container-platform/(3\.7)/install_config/downgrade\.html /container-platform/3\.7/upgrading/downgrade.html [NE,R=301] + RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9)/install_config/advanced_ldap_configuration/(.*)$ /container-platform/$1/install_config/sssd_for_ldap_failover.html [L,R=301] + + # OCP 4.1 redirects + RewriteRule ^container-platform/4\.1/installing/installing_aws_upi/installing-aws-upi\.html /container-platform/4\.1/installing/installing_aws/installing-aws-user-infra.html [NE,R=301] + diff --git a/_topic_map.yml b/_topic_map.yml index 5b9dfeb73f..623aa29dfb 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -98,6 +98,10 @@ Topics: File: installing-aws-network-customizations - Name: Installing a cluster on AWS into an existing VPC File: installing-aws-vpc + - Name: Installing a cluster on AWS using CloudFormation templates + File: installing-aws-user-infra + - Name: Installing a cluster on AWS in a restricted network + File: installing-restricted-networks-aws - Name: Uninstalling a cluster on AWS File: uninstalling-cluster-aws - Name: Installing on Azure @@ -128,18 +132,10 @@ Topics: File: installing-gcp-network-customizations - Name: Installing a cluster on GCP into an existing VPC File: installing-gcp-vpc - - Name: Uninstalling a cluster on GCP - File: uninstalling-cluster-gcp -- Name: Installing on user-provisioned AWS - Dir: installing_aws_user_infra - Topics: - - Name: Installing a cluster on AWS using CloudFormation templates - File: installing-aws-user-infra -- Name: Installing on user-provisioned GCP - Dir: installing_gcp_user_infra - Topics: - Name: Installing a cluster on GCP using Deployment Manager templates File: installing-gcp-user-infra + - Name: Uninstalling a cluster on GCP + File: uninstalling-cluster-gcp - Name: Installing on bare metal Dir: installing_bare_metal Topics: @@ -147,6 +143,8 @@ Topics: File: installing-bare-metal - Name: Installing a cluster on bare metal with network customizations File: installing-bare-metal-network-customizations + - Name: Restricted network bare metal installation + File: installing-restricted-networks-bare-metal - Name: Installing on IBM Z Dir: installing_ibm_z Topics: @@ -172,17 +170,6 @@ Topics: File: installing-vsphere - Name: Installing a cluster on vSphere with network customizations File: installing-vsphere-network-customizations -- Name: Installing in restricted networks - Dir: installing_restricted_networks - Topics: - - Name: Creating a mirror registry for a restricted network - File: installing-restricted-networks-preparations - - Name: Restricted network AWS installation - File: installing-restricted-networks-aws - - Name: Restricted network bare metal installation - File: installing-restricted-networks-bare-metal -# - Name: Restricted network GCP installation -# File: installing-restricted-networks-GCP - Name: Restricted network vSphere installation File: installing-restricted-networks-vsphere - Name: Gathering installation logs @@ -192,6 +179,10 @@ Topics: - Name: Installation configuration Dir: install_config Topics: + - Name: Installation methods for different platforms + File: installation-types + - Name: Creating a mirror registry for a restricted network + File: installing-restricted-networks-preparations - Name: Available cluster customizations File: customizations Distros: openshift-enterprise,openshift-origin diff --git a/installing/install_config/installation-types.adoc b/installing/install_config/installation-types.adoc new file mode 100644 index 0000000000..a7b23a31bb --- /dev/null +++ b/installing/install_config/installation-types.adoc @@ -0,0 +1,73 @@ +[id="installation-types"] += Installation methods for different platforms +include::modules/common-attributes.adoc[] +:context: installation-types +toc::[] + +You can perform different types of installations on different platforms. + +.Installer-provisioned infrastructure options +|=== +||AWS |Azure |GCP |OpenStack |Bare metal |vSphere |IBM Z + +|Default +|xref:../../installing/installing_aws/installing-aws-default.adoc#installing-aws-default[X] +|xref:../../installing/installing_azure/installing-azure-default.adoc#installing-azure-default[X] +|xref:../../installing/installing_gcp/installing-gcp-default.adoc#installing-gcp-default[X] +| +| +| +| + +|Custom +|xref:../../installing/installing_aws/installing-aws-customizations.adoc#installing-aws-customizations[X] +|xref:../../installing/installing_azure/installing-azure-customizations.adoc#installing-azure-customizations[X] +|xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-customizations[X] +|xref:../../installing/installing_openstack/installing-openstack-installer-custom.adoc#installing-openstack-installer-custom[X] +| +| +| + +|Network Operator +|xref:../../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[X] +|xref:../../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[X] +|xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[X] +| +| +| +| + +|=== + +.User-provisioned infrastructure options +|=== +||AWS |Azure |GCP |OpenStack |Bare metal |vSphere |IBM Z + +|Custom +|xref:../../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[X] +| +|xref:../../installing/installing_gcp/installing-gcp-user-infra.adoc#installing-gcp-user-infra[X] +| +|xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[X] +|xref:../../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[X] +|xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[X] + +|Network Operator +| +| +| +| +|xref:../../installing/installing_bare_metal/installing-bare-metal-network-customizations.adoc#installing-bare-metal-network-customizations[X] +|xref:../../installing/installing_vsphere/installing-vsphere-network-customizations.adoc#installing-vsphere-network-customizations[X] +| + +|Restricted network +|xref:../../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[X] +| +| +| +|xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[X] +|xref:../../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[X] +| + +|=== diff --git a/installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc b/installing/install_config/installing-restricted-networks-preparations.adoc similarity index 78% rename from installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc rename to installing/install_config/installing-restricted-networks-preparations.adoc index f1c171faaf..58be3d3b1b 100644 --- a/installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +++ b/installing/install_config/installing-restricted-networks-preparations.adoc @@ -38,5 +38,5 @@ include::modules/installation-restricted-network-samples.adoc[leveloffset=+1] .Next steps * Install a cluster on infrastructure that you provision in your restricted nework, such as on -xref:../../installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[VMware vSphere], -xref:../../installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal], or xref:../../installing/installing_restricted_networks/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[Amazon Web Services]. +xref:../../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[VMware vSphere], +xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal], or xref:../../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[Amazon Web Services]. diff --git a/installing/installing_aws/installing-aws-account.adoc b/installing/installing_aws/installing-aws-account.adoc index 514b8c0742..b63562bb40 100644 --- a/installing/installing_aws/installing-aws-account.adoc +++ b/installing/installing_aws/installing-aws-account.adoc @@ -24,4 +24,4 @@ include::modules/installation-aws-regions.adoc[leveloffset=+1] ** xref:../../installing/installing_aws/installing-aws-default.adoc#installing-aws-default[Quickly install a cluster] with default options ** xref:../../installing/installing_aws/installing-aws-customizations.adoc#installing-aws-customizations[Install a cluster with cloud customizations] ** xref:../../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[Install a cluster with network customizations] -** xref:../../installing/installing_aws_user_infra/installing-aws-user-infra.adoc#installing-aws-user-infra[Install a cluster on infrastructure that you provision] +** xref:../../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[Install a cluster on infrastructure that you provision] diff --git a/installing/installing_aws_user_infra/installing-aws-user-infra.adoc b/installing/installing_aws/installing-aws-user-infra.adoc similarity index 100% rename from installing/installing_aws_user_infra/installing-aws-user-infra.adoc rename to installing/installing_aws/installing-aws-user-infra.adoc diff --git a/installing/installing_restricted_networks/installing-restricted-networks-aws.adoc b/installing/installing_aws/installing-restricted-networks-aws.adoc similarity index 96% rename from installing/installing_restricted_networks/installing-restricted-networks-aws.adoc rename to installing/installing_aws/installing-restricted-networks-aws.adoc index 9aef7fb350..c2a8c1dfec 100644 --- a/installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +++ b/installing/installing_aws/installing-restricted-networks-aws.adoc @@ -22,7 +22,7 @@ according to your company's policies. .Prerequisites -* xref:../../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Create a mirror registry on your bastion host] +* xref:../../installing/install_config/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Create a mirror registry on your bastion host] and obtain the `imageContentSources` data for your version of {product-title}. + [IMPORTANT] diff --git a/installing/installing_aws_user_infra/images b/installing/installing_aws_user_infra/images deleted file mode 120000 index 847b03ed05..0000000000 --- a/installing/installing_aws_user_infra/images +++ /dev/null @@ -1 +0,0 @@ -../../images/ \ No newline at end of file diff --git a/installing/installing_aws_user_infra/modules b/installing/installing_aws_user_infra/modules deleted file mode 120000 index 36719b9de7..0000000000 --- a/installing/installing_aws_user_infra/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules/ \ No newline at end of file diff --git a/installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc b/installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc similarity index 93% rename from installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc rename to installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc index 01701f7e3b..e2ddc51afe 100644 --- a/installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +++ b/installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc @@ -19,7 +19,7 @@ before you attempt to install an {product-title} cluster in such an environment. .Prerequisites -* xref:../../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Create a mirror registry on your bastion host] and obtain the `imageContentSources` data for your version of {product-title}. +* xref:../../installing/install_config/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Create a mirror registry on your bastion host] and obtain the `imageContentSources` data for your version of {product-title}. + [IMPORTANT] ==== diff --git a/installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc b/installing/installing_gcp/installing-gcp-user-infra.adoc similarity index 95% rename from installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc rename to installing/installing_gcp/installing-gcp-user-infra.adoc index eb5705f7d8..975d71b99e 100644 --- a/installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +++ b/installing/installing_gcp/installing-gcp-user-infra.adoc @@ -51,7 +51,7 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2] include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+2] .Additional resources -* xref:../../installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc#installation-gcp-user-infra-adding-ingress_installing-gcp-user-infra[Optional: Adding the ingress DNS records] +* xref:../../installing/installing_gcp/installing-gcp-user-infra.adoc#installation-gcp-user-infra-adding-ingress_installing-gcp-user-infra[Optional: Adding the ingress DNS records] [id="installation-gcp-user-infra-exporting-common-variables"] == Exporting common variables diff --git a/installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc similarity index 92% rename from installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc rename to installing/installing_vsphere/installing-restricted-networks-vsphere.adoc index 057982f4ce..b8d9408c93 100644 --- a/installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +++ b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc @@ -10,7 +10,7 @@ VMware vSphere infrastructure that you provision in a restricted network. .Prerequisites -* xref:../../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Create a mirror registry on your bastion host] and obtain the `imageContentSources` data for your version of {product-title}. +* xref:../../installing/install_config/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[Create a mirror registry on your bastion host] and obtain the `imageContentSources` data for your version of {product-title}. + [IMPORTANT] ==== diff --git a/modules/cli-installing-cli.adoc b/modules/cli-installing-cli.adoc index 9209f04057..06845dc371 100644 --- a/modules/cli-installing-cli.adoc +++ b/modules/cli-installing-cli.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * cli_reference/openshift_cli/getting-started.adoc -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_aws/installing-aws-customizations.adoc // * installing/installing_aws/installing-aws-default.adoc // * installing/installing_aws/installing-aws-network-customizations.adoc @@ -13,8 +13,8 @@ // * installing/installing_gcp/installing-gcp-customizations.adoc // * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_gcp/installing-gcp-vpc.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc +// * installing/install_config/installing-restricted-networks-preparations.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc // diff --git a/modules/cli-logging-in-kubeadmin.adoc b/modules/cli-logging-in-kubeadmin.adoc index 5425ed4404..1dac4fe970 100644 --- a/modules/cli-logging-in-kubeadmin.adoc +++ b/modules/cli-logging-in-kubeadmin.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_aws/installing-aws-customizations.adoc // * installing/installing_aws/installing-aws-default.adoc // * installing/installing_aws/installing-aws-network-customizations.adoc @@ -12,13 +12,13 @@ // * installing/installing_gcp/installing-gcp-customizations.adoc // * installing/installing_gcp/installing-gcp-default.adoc // * installing/installing_gcp/installing-gcp-vpc.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc // * installing/installing_openstack/installing-openstack-installer.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/cluster-entitlements.adoc b/modules/cluster-entitlements.adoc index 3a80720e07..65b459902d 100644 --- a/modules/cluster-entitlements.adoc +++ b/modules/cluster-entitlements.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * architecture/architecture.adoc -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_aws/installing-aws-customizations.adoc // * installing/installing_aws/installing-aws-default.adoc // * installing/installing_aws/installing-aws-network-customizations.adoc @@ -16,9 +16,9 @@ // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc // * installing/installing_openstack/installing-openstack-installer.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-about-mirror-registry.adoc b/modules/installation-about-mirror-registry.adoc index 8f862f4468..ce18cd46af 100644 --- a/modules/installation-about-mirror-registry.adoc +++ b/modules/installation-about-mirror-registry.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +// * installing/install_config/installing-restricted-networks-preparations.adoc [id="installation-about-mirror-registry_{context}"] = About the mirror registry diff --git a/modules/installation-about-restricted-network.adoc b/modules/installation-about-restricted-network.adoc index ae03d37781..63940275c4 100644 --- a/modules/installation-about-restricted-network.adoc +++ b/modules/installation-about-restricted-network.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc [id="installation-about-restricted-networks_{context}"] = About installations in restricted networks diff --git a/modules/installation-approve-csrs.adoc b/modules/installation-approve-csrs.adoc index ff3d9152dd..2229724a86 100644 --- a/modules/installation-approve-csrs.adoc +++ b/modules/installation-approve-csrs.adoc @@ -1,11 +1,11 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc // * machine_management/adding-rhel-compute.adoc @@ -110,4 +110,3 @@ $ oc get csr -ojson | jq -r '.items[] | select(.status == {} ) | .metadata.name' ifeval::["{context}" == "installing-ibm-z"] :!ibm-z: endif::[] - diff --git a/modules/installation-aws-permissions.adoc b/modules/installation-aws-permissions.adoc index 6fc691ab4d..855eff3d04 100644 --- a/modules/installation-aws-permissions.adoc +++ b/modules/installation-aws-permissions.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_aws/installing-aws-account.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-aws-permissions_{context}"] = Required AWS permissions diff --git a/modules/installation-aws-user-infra-bootstrap.adoc b/modules/installation-aws-user-infra-bootstrap.adoc index d95586bc3c..fc0375e2aa 100644 --- a/modules/installation-aws-user-infra-bootstrap.adoc +++ b/modules/installation-aws-user-infra-bootstrap.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-aws-user-infra-bootstrap_{context}"] = Initializing the bootstrap node on AWS with user-provisioned infrastructure diff --git a/modules/installation-aws-user-infra-delete-bootstrap.adoc b/modules/installation-aws-user-infra-delete-bootstrap.adoc index 31064cc753..2757d5c350 100644 --- a/modules/installation-aws-user-infra-delete-bootstrap.adoc +++ b/modules/installation-aws-user-infra-delete-bootstrap.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-aws-user-infra-delete-bootstrap_{context}"] = Deleting the bootstrap resources diff --git a/modules/installation-aws-user-infra-installation.adoc b/modules/installation-aws-user-infra-installation.adoc index 4494433ba5..aa739b5494 100644 --- a/modules/installation-aws-user-infra-installation.adoc +++ b/modules/installation-aws-user-infra-installation.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc ifeval::["{context}" == "installing-restricted-networks-aws"] :restricted: diff --git a/modules/installation-aws-user-infra-requirements.adoc b/modules/installation-aws-user-infra-requirements.adoc index dca43d1888..4126ee922f 100644 --- a/modules/installation-aws-user-infra-requirements.adoc +++ b/modules/installation-aws-user-infra-requirements.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-aws-user-infra-requirements_{context}"] = Required AWS infrastructure components diff --git a/modules/installation-aws-user-infra-rhcos-ami.adoc b/modules/installation-aws-user-infra-rhcos-ami.adoc index 438bfdf8ea..5453f4932a 100644 --- a/modules/installation-aws-user-infra-rhcos-ami.adoc +++ b/modules/installation-aws-user-infra-rhcos-ami.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-aws-user-infra-rhcos-ami_{context}"] = {op-system} AMIs for the AWS infrastructure diff --git a/modules/installation-bare-metal-config-yaml.adoc b/modules/installation-bare-metal-config-yaml.adoc index eb67e14f76..713ceb6f2d 100644 --- a/modules/installation-bare-metal-config-yaml.adoc +++ b/modules/installation-bare-metal-config-yaml.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc ifeval::["{context}" == "installing-restricted-networks-bare-metal"] diff --git a/modules/installation-cloudformation-bootstrap.adoc b/modules/installation-cloudformation-bootstrap.adoc index c3e4a1d8d7..d5fd420fd0 100644 --- a/modules/installation-cloudformation-bootstrap.adoc +++ b/modules/installation-cloudformation-bootstrap.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-cloudformation-bootstrap_{context}"] = CloudFormation template for the bootstrap machine diff --git a/modules/installation-cloudformation-control-plane.adoc b/modules/installation-cloudformation-control-plane.adoc index 7c05546e7f..af8b94c41c 100644 --- a/modules/installation-cloudformation-control-plane.adoc +++ b/modules/installation-cloudformation-control-plane.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-cloudformation-control-plane_{context}"] = CloudFormation template for control plane machines diff --git a/modules/installation-cloudformation-dns.adoc b/modules/installation-cloudformation-dns.adoc index 3f8c658b66..6208bc5eef 100644 --- a/modules/installation-cloudformation-dns.adoc +++ b/modules/installation-cloudformation-dns.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-cloudformation-dns_{context}"] = CloudFormation template for the network and load balancers diff --git a/modules/installation-cloudformation-security.adoc b/modules/installation-cloudformation-security.adoc index b195e3919a..aadc759c54 100644 --- a/modules/installation-cloudformation-security.adoc +++ b/modules/installation-cloudformation-security.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-cloudformation-security_{context}"] = CloudFormation template for security objects diff --git a/modules/installation-cloudformation-vpc.adoc b/modules/installation-cloudformation-vpc.adoc index 5e7e528752..1eb5ffc791 100644 --- a/modules/installation-cloudformation-vpc.adoc +++ b/modules/installation-cloudformation-vpc.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-cloudformation-vpc_{context}"] = CloudFormation template for the VPC diff --git a/modules/installation-cloudformation-worker.adoc b/modules/installation-cloudformation-worker.adoc index 3c360268eb..7252d3508b 100644 --- a/modules/installation-cloudformation-worker.adoc +++ b/modules/installation-cloudformation-worker.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-cloudformation-worker_{context}"] = CloudFormation template for worker machines diff --git a/modules/installation-complete-user-infra.adoc b/modules/installation-complete-user-infra.adoc index 48b4e4d38d..013a4ab883 100644 --- a/modules/installation-complete-user-infra.adoc +++ b/modules/installation-complete-user-infra.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-configure-proxy.adoc b/modules/installation-configure-proxy.adoc index 21811a5690..30e59d3158 100644 --- a/modules/installation-configure-proxy.adoc +++ b/modules/installation-configure-proxy.adoc @@ -1,11 +1,11 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc // * networking/configuring-a-custom-pki.adoc diff --git a/modules/installation-create-ingress-dns-records.adoc b/modules/installation-create-ingress-dns-records.adoc index a57a51d3c2..194a2d3a26 100644 --- a/modules/installation-create-ingress-dns-records.adoc +++ b/modules/installation-create-ingress-dns-records.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-create-ingress-dns-records_{context}"] = Creating the Ingress DNS Records diff --git a/modules/installation-creating-aws-bootstrap.adoc b/modules/installation-creating-aws-bootstrap.adoc index 66a3759007..4b8b5ce8f6 100644 --- a/modules/installation-creating-aws-bootstrap.adoc +++ b/modules/installation-creating-aws-bootstrap.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-creating-aws-bootstrap_{context}"] = Creating the bootstrap node in AWS diff --git a/modules/installation-creating-aws-control-plane.adoc b/modules/installation-creating-aws-control-plane.adoc index b074838a39..03323c2ac9 100644 --- a/modules/installation-creating-aws-control-plane.adoc +++ b/modules/installation-creating-aws-control-plane.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-creating-aws-control-plane_{context}"] = Creating the control plane machines in AWS diff --git a/modules/installation-creating-aws-dns.adoc b/modules/installation-creating-aws-dns.adoc index 1c081ed93d..8c20f75db9 100644 --- a/modules/installation-creating-aws-dns.adoc +++ b/modules/installation-creating-aws-dns.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-creating-aws-dns_{context}"] = Creating networking and load balancing components in AWS diff --git a/modules/installation-creating-aws-security.adoc b/modules/installation-creating-aws-security.adoc index 910721a39c..ec150240e1 100644 --- a/modules/installation-creating-aws-security.adoc +++ b/modules/installation-creating-aws-security.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-creating-aws-security_{context}"] = Creating security group and roles in AWS diff --git a/modules/installation-creating-aws-vpc.adoc b/modules/installation-creating-aws-vpc.adoc index bd1eb74284..3f6b36e4b6 100644 --- a/modules/installation-creating-aws-vpc.adoc +++ b/modules/installation-creating-aws-vpc.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-creating-aws-vpc_{context}"] = Creating a VPC in AWS diff --git a/modules/installation-creating-aws-worker.adoc b/modules/installation-creating-aws-worker.adoc index dc1a1256d3..35618e7580 100644 --- a/modules/installation-creating-aws-worker.adoc +++ b/modules/installation-creating-aws-worker.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc [id="installation-creating-aws-worker_{context}"] = Creating the worker nodes in AWS diff --git a/modules/installation-creating-gcp-bootstrap.adoc b/modules/installation-creating-gcp-bootstrap.adoc index 78897c31ce..4677f7dd92 100644 --- a/modules/installation-creating-gcp-bootstrap.adoc +++ b/modules/installation-creating-gcp-bootstrap.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-creating-gcp-bootstrap_{context}"] = Creating the bootstrap machine in GCP diff --git a/modules/installation-creating-gcp-control-plane.adoc b/modules/installation-creating-gcp-control-plane.adoc index c418fc1181..38b20ba895 100644 --- a/modules/installation-creating-gcp-control-plane.adoc +++ b/modules/installation-creating-gcp-control-plane.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-creating-gcp-control-plane_{context}"] = Creating the control plane machines in GCP diff --git a/modules/installation-creating-gcp-dns.adoc b/modules/installation-creating-gcp-dns.adoc index 06f88d944e..6198f400da 100644 --- a/modules/installation-creating-gcp-dns.adoc +++ b/modules/installation-creating-gcp-dns.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-creating-gcp-dns_{context}"] = Creating networking and load balancing components in GCP diff --git a/modules/installation-creating-gcp-security.adoc b/modules/installation-creating-gcp-security.adoc index 8a9653b244..7c6d563edb 100644 --- a/modules/installation-creating-gcp-security.adoc +++ b/modules/installation-creating-gcp-security.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-creating-gcp-security_{context}"] = Creating firewall rules and IAM roles in GCP diff --git a/modules/installation-creating-gcp-vpc.adoc b/modules/installation-creating-gcp-vpc.adoc index 463ce52cfa..15dedf9d79 100644 --- a/modules/installation-creating-gcp-vpc.adoc +++ b/modules/installation-creating-gcp-vpc.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-creating-gcp-vpc_{context}"] = Creating a VPC in GCP diff --git a/modules/installation-creating-gcp-worker.adoc b/modules/installation-creating-gcp-worker.adoc index 1a73c35d9c..638fe56fcb 100644 --- a/modules/installation-creating-gcp-worker.adoc +++ b/modules/installation-creating-gcp-worker.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-creating-gcp-worker_{context}"] = Creating additional worker machines in GCP diff --git a/modules/installation-creating-mirror-registry.adoc b/modules/installation-creating-mirror-registry.adoc index c887207107..7497b6f7ab 100644 --- a/modules/installation-creating-mirror-registry.adoc +++ b/modules/installation-creating-mirror-registry.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +// * installing/install_config/installing-restricted-networks-preparations.adoc ifeval::["{context}" == "installing-restricted-networks-preparations"] :restricted: diff --git a/modules/installation-deployment-manager-bootstrap.adoc b/modules/installation-deployment-manager-bootstrap.adoc index be94ebeba1..446b540f6d 100644 --- a/modules/installation-deployment-manager-bootstrap.adoc +++ b/modules/installation-deployment-manager-bootstrap.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-deployment-manager-bootstrap_{context}"] = Deployment Manager template for the bootstrap machine diff --git a/modules/installation-deployment-manager-control-plane.adoc b/modules/installation-deployment-manager-control-plane.adoc index 76c6bf625b..d8d3aa55ba 100644 --- a/modules/installation-deployment-manager-control-plane.adoc +++ b/modules/installation-deployment-manager-control-plane.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-deployment-manager-control-plane_{context}"] = Deployment Manager template for control plane machines diff --git a/modules/installation-deployment-manager-dns.adoc b/modules/installation-deployment-manager-dns.adoc index 8c47efdf2f..721a91f9c8 100644 --- a/modules/installation-deployment-manager-dns.adoc +++ b/modules/installation-deployment-manager-dns.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-deployment-manager-dns_{context}"] = Deployment Manager template for the network and load balancers diff --git a/modules/installation-deployment-manager-security.adoc b/modules/installation-deployment-manager-security.adoc index f0bd4cb00f..eb38618f20 100644 --- a/modules/installation-deployment-manager-security.adoc +++ b/modules/installation-deployment-manager-security.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-deployment-manager-security_{context}"] = Deployment Manager template for firewall rules and IAM roles diff --git a/modules/installation-deployment-manager-vpc.adoc b/modules/installation-deployment-manager-vpc.adoc index 84cd0e1ef1..bbcacbb733 100644 --- a/modules/installation-deployment-manager-vpc.adoc +++ b/modules/installation-deployment-manager-vpc.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-deployment-manager-vpc_{context}"] = Deployment Manager template for the VPC diff --git a/modules/installation-deployment-manager-worker.adoc b/modules/installation-deployment-manager-worker.adoc index 9fb83b14c2..a480d30853 100644 --- a/modules/installation-deployment-manager-worker.adoc +++ b/modules/installation-deployment-manager-worker.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-deployment-manager-worker_{context}"] = Deployment Manager template for worker machines diff --git a/modules/installation-dns-user-infra.adoc b/modules/installation-dns-user-infra.adoc index 4a81f8d888..704d148b51 100644 --- a/modules/installation-dns-user-infra.adoc +++ b/modules/installation-dns-user-infra.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-extracting-infraid.adoc b/modules/installation-extracting-infraid.adoc index 1e01fb64b5..78b3ed442e 100644 --- a/modules/installation-extracting-infraid.adoc +++ b/modules/installation-extracting-infraid.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc ifeval::["{context}" == "installing-aws-user-infra"] :cp-first: Amazon Web Services diff --git a/modules/installation-gcp-dns.adoc b/modules/installation-gcp-dns.adoc index bdeeb780c6..c4ed02b41e 100644 --- a/modules/installation-gcp-dns.adoc +++ b/modules/installation-gcp-dns.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_gcp/installing-gcp-account.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-dns_{context}"] = Configuring DNS for GCP diff --git a/modules/installation-gcp-enabling-api-services.adoc b/modules/installation-gcp-enabling-api-services.adoc index 2734d9028d..fb9c1269b9 100644 --- a/modules/installation-gcp-enabling-api-services.adoc +++ b/modules/installation-gcp-enabling-api-services.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_gcp/installing-gcp-account.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-enabling-api-services_{context}"] = Enabling API services in GCP diff --git a/modules/installation-gcp-install-cli.adoc b/modules/installation-gcp-install-cli.adoc index 5c3e6b8dc3..41201f11c8 100644 --- a/modules/installation-gcp-install-cli.adoc +++ b/modules/installation-gcp-install-cli.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-install-cli_{context}"] = Installing and configuring CLI tools for GCP diff --git a/modules/installation-gcp-limits.adoc b/modules/installation-gcp-limits.adoc index d19fdb2a5f..8444a83336 100644 --- a/modules/installation-gcp-limits.adoc +++ b/modules/installation-gcp-limits.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_gcp/installing-gcp-account.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-limits_{context}"] = GCP account limits diff --git a/modules/installation-gcp-permissions.adoc b/modules/installation-gcp-permissions.adoc index 3dbbbc89ee..094d61cb6a 100644 --- a/modules/installation-gcp-permissions.adoc +++ b/modules/installation-gcp-permissions.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_gcp/installing-gcp-account.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-permissions_{context}"] = Required GCP permissions diff --git a/modules/installation-gcp-project.adoc b/modules/installation-gcp-project.adoc index bc8560621d..28575eb19c 100644 --- a/modules/installation-gcp-project.adoc +++ b/modules/installation-gcp-project.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_gcp/installing-gcp-account.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-project_{context}"] = Creating a GCP project diff --git a/modules/installation-gcp-regions.adoc b/modules/installation-gcp-regions.adoc index 92b0e2f8d6..c08fd381dd 100644 --- a/modules/installation-gcp-regions.adoc +++ b/modules/installation-gcp-regions.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_gcp/installing-gcp-account.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-regions_{context}"] = Supported GCP regions diff --git a/modules/installation-gcp-service-account.adoc b/modules/installation-gcp-service-account.adoc index 18ee1b83ad..5f4c4e0e2a 100644 --- a/modules/installation-gcp-service-account.adoc +++ b/modules/installation-gcp-service-account.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_gcp/installing-gcp-account.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-service-account_{context}"] = Creating a service account in GCP diff --git a/modules/installation-gcp-user-infra-adding-ingress.adoc b/modules/installation-gcp-user-infra-adding-ingress.adoc index f0a6adbfc4..9857f54947 100644 --- a/modules/installation-gcp-user-infra-adding-ingress.adoc +++ b/modules/installation-gcp-user-infra-adding-ingress.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-user-infra-adding-ingress_{context}"] = Optional: Adding the ingress DNS records diff --git a/modules/installation-gcp-user-infra-completing.adoc b/modules/installation-gcp-user-infra-completing.adoc index d2bb83057c..5065b6c139 100644 --- a/modules/installation-gcp-user-infra-completing.adoc +++ b/modules/installation-gcp-user-infra-completing.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-user-infra-installation_{context}"] = Completing a GCP installation on user-provisioned infrastructure diff --git a/modules/installation-gcp-user-infra-rhcos.adoc b/modules/installation-gcp-user-infra-rhcos.adoc index 11abcd6efb..f1ba76c3cc 100644 --- a/modules/installation-gcp-user-infra-rhcos.adoc +++ b/modules/installation-gcp-user-infra-rhcos.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-user-infra-rhcos_{context}"] = Creating the {op-system} cluster image for the GCP infrastructure diff --git a/modules/installation-gcp-user-infra-wait-for-bootstrap.adoc b/modules/installation-gcp-user-infra-wait-for-bootstrap.adoc index d1e7f7228c..cf97e0b8c1 100644 --- a/modules/installation-gcp-user-infra-wait-for-bootstrap.adoc +++ b/modules/installation-gcp-user-infra-wait-for-bootstrap.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcps_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc [id="installation-gcp-user-infra-wait-for-bootstrap_{context}"] = Wait for bootstrap completion and remove bootstrap resources in GCP diff --git a/modules/installation-generate-aws-user-infra-install-config.adoc b/modules/installation-generate-aws-user-infra-install-config.adoc index 164e1f5f81..601016c5d8 100644 --- a/modules/installation-generate-aws-user-infra-install-config.adoc +++ b/modules/installation-generate-aws-user-infra-install-config.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc ifeval::["{context}" == "installing-restricted-networks-aws"] :restricted: diff --git a/modules/installation-infrastructure-user-infra.adoc b/modules/installation-infrastructure-user-infra.adoc index 1a4eaa2090..a4eb55b70a 100644 --- a/modules/installation-infrastructure-user-infra.adoc +++ b/modules/installation-infrastructure-user-infra.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-initializing-manual.adoc b/modules/installation-initializing-manual.adoc index ee2ba6a90b..cbc1d6d001 100644 --- a/modules/installation-initializing-manual.adoc +++ b/modules/installation-initializing-manual.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-initializing.adoc b/modules/installation-initializing.adoc index 7e0d831728..b83f3aa0c1 100644 --- a/modules/installation-initializing.adoc +++ b/modules/installation-initializing.adoc @@ -9,7 +9,7 @@ // * installing/installing_gcp/installing-gcp-customizations.adoc // * installing/installing_gcp/installing-gcp-network-customizations.adoc // * installing/installing_gcp/installing-gcp-vpc.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc // Consider also adding the installation-configuration-parameters.adoc module. diff --git a/modules/installation-installing-bare-metal.adoc b/modules/installation-installing-bare-metal.adoc index 39a13b58b5..76b90531d1 100644 --- a/modules/installation-installing-bare-metal.adoc +++ b/modules/installation-installing-bare-metal.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-local-registry-pull-secret.adoc b/modules/installation-local-registry-pull-secret.adoc index 7bbabfd9c1..e0ca83a04d 100644 --- a/modules/installation-local-registry-pull-secret.adoc +++ b/modules/installation-local-registry-pull-secret.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +// * installing/install_config/installing-restricted-networks-preparations.adoc [id="installation-local-registry-pull-secret_{context}"] = Creating a pull secret for your mirror registry diff --git a/modules/installation-mirror-repository.adoc b/modules/installation-mirror-repository.adoc index d5d8c9d20c..0cbc4fc870 100644 --- a/modules/installation-mirror-repository.adoc +++ b/modules/installation-mirror-repository.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +// * installing/install_config/installing-restricted-networks-preparations.adoc [id="installation-mirror-repository_{context}"] = Mirroring the {product-title} image repository diff --git a/modules/installation-network-user-infra.adoc b/modules/installation-network-user-infra.adoc index 5896412492..edb7c9bab7 100644 --- a/modules/installation-network-user-infra.adoc +++ b/modules/installation-network-user-infra.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-obtaining-installer.adoc b/modules/installation-obtaining-installer.adoc index 7e1b0ab483..43289e889a 100644 --- a/modules/installation-obtaining-installer.adoc +++ b/modules/installation-obtaining-installer.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_aws/installing-aws-customizations.adoc // * installing/installing_aws/installing-aws-default.adoc // * installing/installing_aws/installing-aws-network-customizations.adoc diff --git a/modules/installation-operators-config.adoc b/modules/installation-operators-config.adoc index 7155b62e5a..b6413374a3 100644 --- a/modules/installation-operators-config.adoc +++ b/modules/installation-operators-config.adoc @@ -1,10 +1,10 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-registry-storage-config.adoc b/modules/installation-registry-storage-config.adoc index 0690d6d668..928b6f4423 100644 --- a/modules/installation-registry-storage-config.adoc +++ b/modules/installation-registry-storage-config.adoc @@ -1,10 +1,10 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-registry-storage-non-production.adoc b/modules/installation-registry-storage-non-production.adoc index eecca3ab1c..4aec1785f2 100644 --- a/modules/installation-registry-storage-non-production.adoc +++ b/modules/installation-registry-storage-non-production.adoc @@ -1,10 +1,10 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-requirements-user-infra.adoc b/modules/installation-requirements-user-infra.adoc index 01e64e8ed1..fab1ab1657 100644 --- a/modules/installation-requirements-user-infra.adoc +++ b/modules/installation-requirements-user-infra.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-restricted-network-samples.adoc b/modules/installation-restricted-network-samples.adoc index 23da11fa74..e2b6a76930 100644 --- a/modules/installation-restricted-network-samples.adoc +++ b/modules/installation-restricted-network-samples.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc +// * installing/install_config/installing-restricted-networks-preparations.adoc [id="installation-restricted-network-samples_{context}"] = Using sample imagestreams in a restricted network installation diff --git a/modules/installation-user-infra-exporting-common-variables.adoc b/modules/installation-user-infra-exporting-common-variables.adoc index c4ff6536b5..07078975e1 100644 --- a/modules/installation-user-infra-exporting-common-variables.adoc +++ b/modules/installation-user-infra-exporting-common-variables.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc ifeval::["{context}" == "installing-gcp-user-infra"] :cp-first: Google Cloud Platform diff --git a/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc b/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc index 8e3a77ae26..63c868ca66 100644 --- a/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc +++ b/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc @@ -1,11 +1,11 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/installation-user-infra-generate.adoc b/modules/installation-user-infra-generate.adoc index ac33236292..10120c96d1 100644 --- a/modules/installation-user-infra-generate.adoc +++ b/modules/installation-user-infra-generate.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_gcp/installing-gcp-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc ifeval::["{context}" == "installing-restricted-networks-aws"] :restricted: diff --git a/modules/installation-user-infra-machines-iso.adoc b/modules/installation-user-infra-machines-iso.adoc index bd41bf741a..ebd6abad6b 100644 --- a/modules/installation-user-infra-machines-iso.adoc +++ b/modules/installation-user-infra-machines-iso.adoc @@ -1,7 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_ibm_z/installing-ibm-z.adoc [id="installation-user-infra-machines-iso_{context}"] = Creating {op-system-first} machines using an ISO image diff --git a/modules/installation-user-infra-machines-pxe.adoc b/modules/installation-user-infra-machines-pxe.adoc index 17a47d3849..0b2fdff44f 100644 --- a/modules/installation-user-infra-machines-pxe.adoc +++ b/modules/installation-user-infra-machines-pxe.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc [id="installation-user-infra-machines-pxe_{context}"] = Creating {op-system-first} machines by PXE or iPXE booting diff --git a/modules/installation-vsphere-config-yaml.adoc b/modules/installation-vsphere-config-yaml.adoc index d1176e5248..d39bd232f1 100644 --- a/modules/installation-vsphere-config-yaml.adoc +++ b/modules/installation-vsphere-config-yaml.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc ifeval::["{context}" == "installing-restricted-networks-vsphere"] diff --git a/modules/installation-vsphere-infrastructure.adoc b/modules/installation-vsphere-infrastructure.adoc index 932af262b6..8abafc7c27 100644 --- a/modules/installation-vsphere-infrastructure.adoc +++ b/modules/installation-vsphere-infrastructure.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-vsphere-infrastructure_{context}"] diff --git a/modules/installation-vsphere-machines.adoc b/modules/installation-vsphere-machines.adoc index 53ed15e51e..d17b692d62 100644 --- a/modules/installation-vsphere-machines.adoc +++ b/modules/installation-vsphere-machines.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc [id="installation-vsphere-machines_{context}"] diff --git a/modules/registry-change-management-state.adoc b/modules/registry-change-management-state.adoc index ead6b8a426..03f00d5751 100644 --- a/modules/registry-change-management-state.adoc +++ b/modules/registry-change-management-state.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * registry/configuring-registry-storage/configuring-registry-storage-baremetal.adoc // * registry/configuring-registry-storage/configuring-registry-storage-vsphere.adoc @@ -41,5 +41,5 @@ spec: maxRunning: 0 maxWaitInQueue: 0s defaultRoute: true - managementState: Managed + managementState: Managed ---- diff --git a/modules/registry-configuring-storage-aws-user-infra.adoc b/modules/registry-configuring-storage-aws-user-infra.adoc index c401c6687a..f6ef9adb34 100644 --- a/modules/registry-configuring-storage-aws-user-infra.adoc +++ b/modules/registry-configuring-storage-aws-user-infra.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc // * registry/configuring-registry-storage-aws-user-infrastructure.adoc [id="registry-configuring-storage-aws-user-infra_{context}"] diff --git a/modules/registry-configuring-storage-baremetal.adoc b/modules/registry-configuring-storage-baremetal.adoc index ff7200dae5..b626080757 100644 --- a/modules/registry-configuring-storage-baremetal.adoc +++ b/modules/registry-configuring-storage-baremetal.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc // * registry/configuring-registry-storage-baremetal // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/modules/registry-configuring-storage-vsphere.adoc b/modules/registry-configuring-storage-vsphere.adoc index fef84dd9f6..024878ccd1 100644 --- a/modules/registry-configuring-storage-vsphere.adoc +++ b/modules/registry-configuring-storage-vsphere.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * registry/configuring-registry-storage-vsphere.adoc diff --git a/modules/registry-removed.adoc b/modules/registry-removed.adoc index 0030fcfc24..79f8ffe646 100644 --- a/modules/registry-removed.adoc +++ b/modules/registry-removed.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * registry/configuring-registry-storage/configuring-registry-storage-baremetal.adoc // * registry/configuring-registry-storage/configuring-registry-storage-vsphere.adoc diff --git a/modules/ssh-agent-using.adoc b/modules/ssh-agent-using.adoc index 89b5f52f4f..3574550307 100644 --- a/modules/ssh-agent-using.adoc +++ b/modules/ssh-agent-using.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * installing/installing_aws_user_infra/installing-aws-user-infra.adoc +// * installing/installing_aws/installing-aws-user-infra.adoc // * installing/installing_aws/installing-aws-customizations.adoc // * installing/installing_aws/installing-aws-default.adoc // * installing/installing_aws/installing-aws-network-customizations.adoc @@ -15,9 +15,9 @@ // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc // * installing/installing_openstack/installing-openstack-installer.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc -// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * installing/installing_ibm_z/installing-ibm-z.adoc diff --git a/service_mesh/service_mesh_install/preparing-ossm-installation.adoc b/service_mesh/service_mesh_install/preparing-ossm-installation.adoc index 7b19a57e9d..f75c79aa24 100644 --- a/service_mesh/service_mesh_install/preparing-ossm-installation.adoc +++ b/service_mesh/service_mesh_install/preparing-ossm-installation.adoc @@ -12,7 +12,7 @@ Before you can install {ProductName}, review the installation activities, ensure * Review the xref:../../architecture/architecture-installation.adoc#installation-overview_architecture-installation[{product-title} {product-version} overview]. * Install {product-title} {product-version}. ** xref:../../installing/installing_aws/installing-aws-account.adoc#installing-aws-account[Install {product-title} {product-version} on AWS] -** xref:../../installing/installing_aws_user_infra/installing-aws-user-infra.adoc#installing-aws-user-infra[Install {product-title} {product-version} on user-provisioned AWS] +** xref:../../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[Install {product-title} {product-version} on user-provisioned AWS] ** xref:../../installing/installing_bare_metal/installing-bare-metal.adoc#installing-bare-metal[Install {product-title} {product-version} on bare metal] ** xref:../../installing/installing_vsphere/installing-vsphere.adoc#installing-vsphere[Install {product-title} {product-version} on vSphere] * Install the version of the {product-title} command line utility (the `oc` client tool) that matches your {product-title} version and add it to your path. diff --git a/welcome/index.adoc b/welcome/index.adoc index 6403984166..4b52621bac 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -26,7 +26,7 @@ ifdef::openshift-enterprise,openshift-origin[] As someone setting out to install an {product-title} {product-version} cluster, this documentation will help you: - **xref:../installing/installing_aws/installing-aws-account.adoc#installing-aws-account[Install a cluster on AWS]**: You have the most installation options when you deploy a cluster on Amazon Web Services (AWS). You can deploy clusters with xref:../installing/installing_aws/installing-aws-default.adoc#installing-aws-default[default settings] or xref:../installing/installing_aws/installing-aws-customizations.adoc#installing-aws-customizations[custom AWS settings]. -You can also deploy a cluster on AWS infrastructure that you provisioned yourself. You can modify the provided xref:../installing/installing_aws_user_infra/installing-aws-user-infra.adoc#installing-aws-user-infra[AWS CloudFormation templates] to meet your needs. +You can also deploy a cluster on AWS infrastructure that you provisioned yourself. You can modify the provided xref:../installing/installing_aws/installing-aws-user-infra.adoc#installing-aws-user-infra[AWS CloudFormation templates] to meet your needs. - **Install a cluster on Azure**: You can deploy clusters with xref:../installing/installing_azure/installing-azure-default.adoc#installing-azure-default[default settings], xref:../installing/installing_azure/installing-azure-customizations.adoc#installing-azure-customizations[custom Azure settings], or xref:../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[custom networking settings] in Microsoft Azure. @@ -49,13 +49,13 @@ xref:../installing/installing_openstack/installing-openstack-troubleshooting.ado - **Install a cluster in a restricted network**: If your cluster that uses user-provisioned infrastructure on -xref:../installing/installing_restricted_networks/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[AWS], +xref:../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[AWS], GCP, -xref:../installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[vSphere], +xref:../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[vSphere], or -xref:../installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal] +xref:../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal] does not have full access to the internet, you can -xref:../installing/installing_restricted_networks/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[mirror the {product-title} installation images] +xref:../installing/install_config/installing-restricted-networks-preparations.adoc#installing-restricted-networks-preparations[mirror the {product-title} installation images] and install a cluster in a restricted network. - **xref:../installing/installing-gather-logs.adoc#[Check installation logs]**: Access installation logs to evaluate issues that occur during {product-title} {product-version} installation.