diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/_index.md
new file mode 100644
index 00000000000..acf44ed8fb1
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/_index.md
@@ -0,0 +1,29 @@
+---
+title: "Air Gap: High Availability Install"
+weight: 290
+aliases:
+ - /rancher/v2.x/en/installation/air-gap-installation/install-rancher/
+---
+
+## Prerequisites
+
+Rancher supports air gap installs using a private registry. You must have your own private registry or other means of distributing Docker images to your machines. If you need help with creating a private registry, please refer to the [Docker documentation](https://docs.docker.com/registry/).
+
+The following CLI tools are required for this install. Make sure these tools are installed on your workstation and available in your `$PATH`.
+
+* [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl) - Kubernetes command-line tool.
+* [rke]({{< baseurl >}}/rke/v0.1.x/en/installation/) - Rancher Kubernetes Engine, cli for building Kubernetes clusters.
+* [helm](https://docs.helm.sh/using_helm/#installing-helm) - Package management for Kubernetes.
+
+>**Note:** If you install Rancher in an HA configuration in an air gap environment, you cannot transition to a single-node setup during future upgrades.
+
+## Installation Outline
+
+- [1. Create Nodes and Load Balancer]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/provision-hosts/)
+- [2. Collect and Publish Image Sources]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/prepare-private-registry/)
+- [3. Install Kubernetes with RKE]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/install-kube/)
+- [4. Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/install-rancher/)
+- [5. Configure Rancher for the Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/)
+
+
+### [Next: Create Nodes and Load Balancer]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/provision-hosts/)
diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/_index.md
new file mode 100644
index 00000000000..b5d0a5cc75f
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/_index.md
@@ -0,0 +1,24 @@
+---
+title: "5. Configure Rancher for the Private Registry"
+weight:
+aliases:
+
+---
+
+Rancher needs to be configured to use the private registry in order to provision any [Rancher launched Kubernetes clusters]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/) or [Rancher tools]({{< baseurl >}}/rancher/v2.x/en/tools/).
+
+>**Note:** If you want to configure Rancher for your private registry when when starting the rancher/rancher container, you can use the environment variable `CATTLE_SYSTEM_DEFAULT_REGISTRY`.
+
+1. Log into Rancher and configure the default admin password.
+
+1. Go into the **Settings** view.
+
+ 
+
+1. Look for the setting called `system-default-registry` and choose **Edit**.
+
+ 
+
+1. Change the value to your registry (e.g. `registry.yourdomain.com:port`). Do not prefix the registry with `http://` or `https://`.
+
+ 
\ No newline at end of file
diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/install-kube/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/install-kube/_index.md
new file mode 100644
index 00000000000..30695200b6e
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/install-kube/_index.md
@@ -0,0 +1,64 @@
+---
+title: "3. Install Kubernetes with RKE"
+weight: 300
+aliases:
+
+---
+
+## A. Create an RKE Config File
+
+From a system that can access ports 22/tcp and 6443/tcp on your host nodes, use the sample below to create a new file named `rancher-cluster.yml`. This file is a Rancher Kubernetes Engine configuration file (RKE config file), which is a configuration for the cluster you're deploying Rancher to.
+
+Replace values in the code sample below with help of the _RKE Options_ table. Use the IP address or DNS names of the [3 nodes]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/provision-hosts) you created.
+
+>**Tip:** For more details on the options available, see the RKE [Config Options](http://localhost:9001/rke/v0.1.x/en/config-options/).
+
+RKE Options
+
+| Option | Required | Description |
+| ------------------ | -------- | -------------------------------------------------------------------------------------- |
+| `address` | ✓ | The DNS or IP address for the node within the air gap network. |
+| `user` | ✓ | A user that can run docker commands. |
+| `role` | ✓ | List of Kubernetes roles assigned to the node. |
+| `internal_address` | optional1 | The DNS or IP address used for internal cluster traffic. |
+| `ssh_key_path` | | Path to SSH private key used to authenticate to the node (defaults to `~/.ssh/id_rsa`). |
+
+
+> 1 Some services like AWS EC2 require setting the `internal_address` if you want to use self-referencing security groups or firewalls.
+
+```yaml
+nodes:
+- address: 10.10.3.187 # node air gap network IP
+ internal_address: 172.31.7.22 # node intra-cluster IP
+ user: rancher
+ role: [ "controlplane", "etcd", "worker" ]
+ ssh_key_file: /home/user/.ssh/id_rsa
+- address: 10.10.3.254 # node air gap network IP
+ internal_address: 172.31.13.132 # node intra-cluster IP
+ user: rancher
+ role: [ "controlplane", "etcd", "worker" ]
+ ssh_key_file: /home/user/.ssh/id_rsa
+- address: 10.10.3.89 # node air gap network IP
+ internal_address: 172.31.3.216 # node intra-cluster IP
+ user: rancher
+ role: [ "controlplane", "etcd", "worker" ]
+ ssh_key_file: /home/user/.ssh/id_rsa
+
+private_registries:
+- url: # private registry url
+ user: rancher
+ password: "*********"
+ is_default: true
+```
+
+
+
+## B. Run RKE
+
+After configuring `rancher-cluster.yml`, open Terminal and change directories to the RKE binary. Then enter the command below to stand up your high availability cluster.
+
+```
+rke up --config ./rancher-cluster.yml
+```
+
+### [Next: Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/install-rancher)
diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/install-rancher/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/install-rancher/_index.md
new file mode 100644
index 00000000000..758758c3e73
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/install-rancher/_index.md
@@ -0,0 +1,129 @@
+---
+title: 4. Install Rancher
+weight: 400
+aliases:
+---
+
+## A. Add the Helm Chart Repository
+
+
+From a system that has access to the internet, render the installs and copy the resulting manifests to a system that has access to the Rancher server cluster.
+
+1. If you haven't already, initialize `helm` locally on a system that has internet access.
+
+ ```plain
+ helm init -c
+ ```
+
+2. Use `helm repo add` command to add the Helm chart repository that contains charts to install Rancher. For more information about the repository choices and which is best for your use case, see [Choosing a Version of Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories).
+
+ Replace both occurences of `` with the Helm chart repository that you want to use (i.e. `latest` or `stable`).
+
+ ```
+ helm repo add rancher- https://releases.rancher.com/server-charts/
+ ```
+3. Fetch the latest Rancher chart. This will pull down the chart and save it in the current directory as a `.tgz` file. Replace `` with the repo you're using (`latest` or `stable`).
+
+ ```plain
+ helm fetch rancher-/rancher
+ ```
+
+>Want additional options? Need help troubleshooting? See [High Availability Install: Advanced Options]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/#advanced-configurations).
+
+
+## B. Choose your SSL Configuration
+
+Rancher Server is designed to be secure by default and requires SSL/TLS configuration.
+
+For HA air gap configurations, there are two recommended options for the source of the certificate.
+
+> **Note:** If you want terminate SSL/TLS externally, see [TLS termination on an External Load Balancer]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/#external-tls-termination).
+
+| Configuration | Chart option | Description | Requires cert-manager |
+|-----|-----|-----|-----|
+| [Rancher Generated Self-Signed Certificates](#self-signed) | `ingress.tls.source=rancher` | Use certificates issued by Rancher's generated CA (self signed)
This is the **default** | yes |
+| [Certificates from Files](#secret) | `ingress.tls.source=secret` | Use your own certificate files by creating Kubernetes Secret(s) | no |
+
+## C. Install Rancher
+
+Based on the choice your made in [B. Choose your SSL Coniguration](#b-optional-install-cert-manager), complete one of the procedures below.
+
+{{% accordion id="self-signed" label="Option A: Default Self-Signed Certificate" %}}
+By default, Rancher generates a CA and uses cert manger to issue the certificate for access to the Rancher server interface.
+
+1. From a system connected to the internet, fetch the latest cert-manager chart available from the [official Helm chart repository](https://github.com/helm/charts/tree/master/stable).
+
+ ```plain
+ helm fetch stable/cert-manager
+ ```
+
+1. Render the cert manager template with the options you would like to use to install the chart. Remember to set the `image.repository` option to pull the image from your private registry. This will create a `cert-manager` directory with the Kubernetes manifest files.
+
+ ```plain
+ helm template ./cert-manager-.tgz --output-dir . \
+ --name cert-manager --namespace kube-system \
+ --set image.repository=/quay.io/jetstack/cert-manager-controller
+ ```
+
+1. Render the Rancher template, declaring your chosen options. Use the reference table below to replace each placeholder.
+
+ Placeholder | Description
+ ------------|-------------
+ `` | The version number of the output tarball.
+ `` | The DNS name you pointed at your load balancer.
+ `` | The DNS name for your private registry.).
+
+
+ ```plain
+ helm template ./rancher-.tgz --output-dir . \
+ --name rancher \
+ --namespace cattle-system \
+ --set hostname= \
+ --set rancherImage=/rancher/rancher
+ ```
+
+{{% /accordion %}}
+
+{{% accordion id="secret" label="Option B: Certificates for Files (Kubernetes Secret)" %}}
+
+1. Create Kubernetes secrets from your own certificates for Rancher to use.
+
+ > **Note:** The common name for the cert will need to match the `hostname` option or the ingress controller will fail to provision the site for Rancher.
+
+1. Render the Rancher template, declaring your chosen options. Use the reference table below to replace each placeholder.
+
+ Placeholder | Description
+ ------------|-------------
+ `` | The version number of the output tarball.
+ `` | The DNS name you pointed at your load balancer.
+ `` | The DNS name for your private registry.
+
+
+ > **Note:** If you are using a Private CA signed cert, add `--set privateCA=true` following `--set ingress.tls.source=secret`
+
+ ```
+ helm template ./rancher-.tgz --output-dir . \
+ --name rancher \
+ --namespace cattle-system \
+ --set hostname= \
+ --set rancherImage=/rancher/rancher
+ --set ingress.tls.source=secret \
+```
+
+1. See [Adding TLS Secrets]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/) to publish the certificate files so Rancher and the ingress controller can use them.
+{{% /accordion %}}
+
+## D. Install Rancher
+
+Copy the rendered manifest directories to a system that has access to the Rancher server cluster to complete installation.
+
+Use `kubectl` to create namespaces and apply the rendered manifests.
+
+```plain
+kubectl -n kube-system apply -R -f ./cert-manager
+
+kubectl create namespace cattle-system
+kubectl -n cattle-system apply -R -f ./rancher
+```
+
+### [Next: Configure Rancher for the Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/config-rancher-for-private-reg/)
diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/prepare-private-registry/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/prepare-private-registry/_index.md
new file mode 100644
index 00000000000..0dccd3b3818
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/prepare-private-registry/_index.md
@@ -0,0 +1,80 @@
+---
+title: "2. Prepare Private Registry"
+weight: 200
+aliases:
+
+---
+
+## A. Collect Images
+
+Start by collecting all the images needed to install Rancher in an air gap environment. You'll collect images from your chosen Rancher release, RKE, and (if you're using a self-signed TLS certificate) Cert-Manager.
+
+1. Using a computer with internet access, browse to our [releases page](https://github.com/rancher/rancher/releases) and find the Rancher v2.1.x release that you want to install. Don't download releases marked `rc` or `Pre-release`, as they are not stable for production environments.
+
+ 
+
+2. From the release's **Assets** section (pictured above), download the following three files, which are required to install Rancher in an air gap environment:
+
+
+ | Release File | Description |
+ | --- | --- |
+ | `rancher-images.txt` | This file contains a list of all files needed to install Rancher.
+ | `rancher-save-images.sh` | This script pulls all the images in the `rancher-images.txt` from Docker Hub and saves all of the images as `rancher-images.tar.gz`. |
+ | `rancher-load-images.sh` | This script loads images from the `rancher-images.tar.gz` file and pushes them to your private registry. |
+
+
+1. Make `rancher-save-images.sh` an executable.
+
+ ```
+ chmod +x rancher-save-images.sh
+ ```
+
+
+1. From the directory that contains the RKE binary, add RKE's images to `rancher-images.txt`, which is a list of all the files needed to install Rancher.
+
+ ```
+ rke config --system-images >> ./rancher-images.txt
+ ```
+1. **Default Rancher Generated Self-Signed Certificate Users Only:** If you elect to use the Rancher default self-signed TLS certificates, you must add the [`cert-manager`](https://github.com/helm/charts/tree/master/stable/cert-manager) image to `rancher-images.txt` as well. You may skip to [B. Publish Images](#b-publish-images ) if you are using you using your own certificates.
+
+ 1. Fetch the latest `cert-manager` Helm chart and parse the template for image details.
+
+ ```plain
+ helm fetch stable/cert-manager
+ helm template ./cert-manager-.tgz | grep -oP '(?<=image: ").*(?=")' >> ./rancher-images.txt
+ ```
+
+ 2. Sort and unique the images list to remove any overlap between the sources.
+
+ ```plain
+ sort -u rancher-images.txt -o rancher-images.txt
+ ```
+
+1. Run `rancher-save-images.sh` with the `rancher-images.txt` image list to create a tarball of all the required images.
+
+ ```plain
+ ./rancher-save-images.sh --image-list ./rancher-images.txt
+ ```
+
+ **Step Result:** Docker begins pulling the images used for an air gap install. Be patient. This process takes a few minutes. When the process completes, your current directory will output a tarball named `rancher-images.tar.gz`. Check that the output is in the directory.
+
+## B. Publish Images
+
+
+Using a computer with access to the internet and your private registry, move the images from `rancher-images.txt` to your private registry using the image scripts.
+
+>**Note:** Image publication may require up to 20GB of empty disk space.
+
+1. Log into your private registry if required.
+
+ ```plain
+ docker login
+ ```
+
+1. Use `rancher-load-images.sh` to extract, tag and push `rancher-images.txt` and `rancher-images.tar.gz` to your private registry.
+
+ ```plain
+ ./rancher-load-images.sh --image-list ./rancher-images.txt --registry
+ ```
+
+### [Next: Install Kubernetes with RKE]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/install-kube/)
\ No newline at end of file
diff --git a/content/rancher/v2.x/en/installation/air-gap-high-availability/provision-hosts/_index.md b/content/rancher/v2.x/en/installation/air-gap-high-availability/provision-hosts/_index.md
new file mode 100644
index 00000000000..aa911439019
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-high-availability/provision-hosts/_index.md
@@ -0,0 +1,36 @@
+---
+title: "1. Create Nodes and Load Balancer"
+weight: 100
+aliases:
+---
+Provision three air gapped Linux hosts according to our requirements below to launch Rancher in an HA configuration.
+
+These hosts should be disconnected from the internet, but should have connectivity with your private registry.
+
+### Host Requirements
+
+View hardware and software requirements for each of your cluster nodes in [Requirements]({{< baseurl >}}/rancher/v2.x/en/installation/requirements).
+
+### Recommended Architecture
+
+- DNS for Rancher should resolve to a layer 4 load balancer
+- The Load Balancer should forward port TCP/80 and TCP/443 to all 3 nodes in the Kubernetes cluster.
+- The Ingress controller will redirect HTTP to HTTPS and terminate SSL/TLS on port TCP/443.
+- The Ingress controller will forward traffic to port TCP/80 on the pod in the Rancher deployment.
+
+HA Rancher install with layer 4 load balancer, depicting SSL termination at ingress controllers
+
+
+
+### Load Balancer
+
+RKE, the installer that provisions your air gapped cluster, will configure an Ingress controller pod on each of your nodes. The Ingress controller pods are bound to ports TCP/80 and TCP/443 on the host network and are the entry point for HTTPS traffic to the Rancher server.
+
+Configure a load balancer as a basic Layer 4 TCP forwarder. The exact configuration will vary depending on your environment.
+
+**Load Balancer Configuration Samples:**
+
+- [NGINX]({{< baseurl >}}/rancher/v2.x/en/installation/ha/create-nodes-lb/nginx)
+- [Amazon NLB]({{< baseurl >}}/rancher/v2.x/en/installation/ha/create-nodes-lb/nlb)
+
+### [Next: Collect and Publish Image Sources]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/prepare-private-registry/)
diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/_index.md
deleted file mode 100644
index b6a943ab19c..00000000000
--- a/content/rancher/v2.x/en/installation/air-gap-installation/_index.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: Air Gap Install
-weight: 300
----
-In environments where security is high priority, you can set up Rancher in an air gap configuration. Air gap installs are more secure than standard single-node or HA deployments because the network that runs Rancher is disconnected from the Internet, reducing your security surface area.
-
-## Prerequisites
-
-- Rancher supports air gap installs using a private registry. You must have your own private registry or other means of distributing Docker images to your machine. If you need help with creating a private registry, please refer to the [Docker documentation](https://docs.docker.com/registry/).
-
- For each Rancher [release](https://github.com/rancher/rancher/releases), we provide the Docker images and scripts needed to mirror these images to your own registry. The Docker images are used when installing Rancher in an HA setup, when provisioning a cluster where Rancher is launching Kubernetes, or when you enable features like pipelines or logging.
-
-- **Installation Option:** Before beginning your air gap installation, choose whether you want ~~a~~ [single-node install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node) or a [high availability install]({{< baseurl >}}/rancher/v2.x/en/installation/ha). View your chosen configuration's introduction notes along with Rancher's [node requirements]({{< baseurl >}}/rancher/v2.x/en/installation/requirements).
-
-## Caveats
-
-Any Rancher version prior to v2.1.0, registries with authentication are not supported when installing Rancher in HA or provisioning clusters, but after clusters are provisioned, registries with authentication can be used in the Kubernetes clusters.
-
-As of v2.1.0, registries with authentication work for installing Rancher as well as provisioning clusters.
-
-## Air Gap Installation Outline
-
-While installing Rancher in an air gap configuration, you'll complete several different tasks.
-
-- [1—Preparing the Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/)
-- [2—Installing Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/)
-- [3—Configuring Rancher to default to the Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/private-registry/)
-
-
-### [Next: Prepare the Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/)
diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md
deleted file mode 100644
index 2adfc00ff8c..00000000000
--- a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md
+++ /dev/null
@@ -1,156 +0,0 @@
----
-title: 2—Installing Rancher
-weight: 50
----
-
-After your private registry is set up for your Rancher installation, complete your installation. Follow one of the procedures below based on the configuration in which you want to run Rancher.
-
-{{% tabs %}}
-{{% tab "HA Install" %}}
-This guide will take you through the basic process of installing Rancher Server HA in a Air Gap environment. Please see the [High Availability Install]({{< baseurl >}}/rancher/v2.x/en/installation/ha) guide for additional options and troubleshooting.
-
-## RKE
-
-On a system that has access (22/tcp and 6443/tcp) to the nodes you have built to host the Rancher server cluster, use the sample below create the `rancher-cluster.yml` file. Define your nodes and fill out the details for the private registry.
-
-See [Install Kubernetes with RKE]({{< baseurl >}}/rancher/v2.x/en/installation/ha/kubernetes-rke/) for more details on the options available.
-
-Replace values in the code sample according to the table below.
-
-| Directive Replacement | Description |
-| ----------------------- | --------------------------------------------------------------------- |
-| `address` | The IP address for each of your air gap nodes outside of the cluster. |
-| `internal_address` | The IP address for each of your air gap nodes within the cluster. |
-| `url` | The URL for your private registry. |
-
-```yaml
-nodes:
-- address: 18.222.121.187 # air gap node external IP
- internal_address: 172.31.7.22 # air gap node internal IP
- user: rancher
- role: [ "controlplane", "etcd", "worker" ]
- ssh_key_file: /home/user/.ssh/id_rsa
-- address: 18.220.193.254 # air gap node external IP
- internal_address: 172.31.13.132 # air gap node internal IP
- user: rancher
- role: [ "controlplane", "etcd", "worker" ]
- ssh_key_file: /home/user/.ssh/id_rsa
-- address: 13.59.83.89 # air gap node external IP
- internal_address: 172.31.3.216 # air gap node internal IP
- user: rancher
- role: [ "controlplane", "etcd", "worker" ]
- ssh_key_file: /home/user/.ssh/id_rsa
-
-private_registries:
-- url: # private registry url
- user: rancher
- password: "*********"
- is_default: true
-```
-
-### Run RKE
-
-```plain
-rke up --config ./rancher-cluster.yml
-```
-
-### Testing the Cluster
-
-Follow the rest of the [Install Kubernetes with RKE]({{< baseurl >}}/rancher/v2.x/en/installation/ha/kubernetes-rke/) guide to test your cluster and verify the health of your pods before continuing.
-
-## Helm
-
-Instead of installing the `tiller` agent on the cluster, render the installs on a system that has access to the internet and copy resulting manifests to a system that has access to the Rancher server cluster.
-
-### Initialize Helm Locally
-
-Skip the [Initialize Helm (Install Tiller)]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-init/) and initialize `helm` locally on a system that has internet access.
-
-```plain
-helm init -c
-```
-
-## Installing Rancher
-
-If you set up a default private registry with credentials in RKE, the Kubernetes `kubelet` will have the credentials for your private registry configured.
-
-### Render Templates
-
-Fetch and render the `helm` charts on a system that has internet access.
-
-#### Cert-Manager
-
-If you are installing Rancher with Rancher self-signed certificates you will need to install 'cert-manager' on your cluster. If you are installing your own certificates you may skip this section.
-
-Fetch the latest `cert-manager` chart from the [official Helm chart repository](https://github.com/helm/charts/tree/master/stable).
-
-```plain
-helm fetch stable/cert-manager
-```
-
-Render the template with the option you would use to install the chart. Remember to set the `image.repository` option to pull the image from your private registry. This will create a `cert-manager` directory with the Kubernetes manifest files.
-
-```plain
-helm template ./cert-manager-.tgz --output-dir . \
---name cert-manager --namespace kube-system \
---set image.repository=/quay.io/jetstack/cert-manager-controller
-```
-
-#### Rancher
-
-Add the Helm chart repository that contains charts to install Rancher. Replace `` with the [repository that you're using]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/#helm-chart-repositories) (i.e. `latest` or `stable`).
-
-```plain
-helm repo add rancher- https://releases.rancher.com/server-charts/
-```
-
-Fetch the latest Rancher chart. This will pull down the chart and save it in the current directory as a `.tgz` file. Replace `` with the repo you're using (`latest` or `stable`).
-
-```plain
-helm fetch rancher-/rancher
-```
-
-Render the template with the options you would use to install the chart. See [Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/) for details on the various options. Remember to set the `rancherImage` option to pull the image from your private registry. This will create a `rancher` directory with the Kubernetes manifest files.
-
-```plain
-helm template ./rancher-.tgz --output-dir . \
---name rancher --namespace cattle-system \
---set hostname= \
---set rancherImage=/rancher/rancher
-```
-
-### Copy Manifests
-
-Copy the rendered manifest directories to a system that has access to the Rancher server cluster.
-
-### Apply the Manifests
-
-Use `kubectl` to create namespaces and apply the rendered manifests.
-
-```plain
-kubectl -n kube-system apply -R -f ./cert-manager
-
-kubectl create namespace cattle-system
-kubectl -n cattle-system apply -R -f ./rancher
-```
-
-Make sure you follow any additional instructions required by SSL install options. See [Choose your SSL Configuration]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/#choose-your-ssl-configuration) for details.
-
-{{% /tab %}}
-{{% tab "Single Node" %}}
-To deploy Rancher on a single node in an air gap environment, follow the instructions in the standard [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/). Parts of the install where you must complete a special action for air gap are flagged with a substitute step, which is listed in the subheading below.
-
-### Add Private Registry URL to Run Command
-
-When you get to the section [Choose an SSL Option and Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/single-node/#2-choose-an-ssl-option-and-install-rancher), regardless of which install option you choose, prepend your Rancher image tag with your private registry URL (``), as shown in the example below.
-
-```plain
-docker run -d --restart=unless-stopped \
- -p 80:80 -p 443:443 \
- /rancher/rancher:
-```
-
-{{% /tab %}}
-{{% /tabs %}}
-
-### [Next: Configuring Rancher for the Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/config-rancher-for-private-reg/)
diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/_index.md
deleted file mode 100644
index 05a6d06829e..00000000000
--- a/content/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/_index.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: 1—Preparing the Private Registry
-weight: 25
----
-
-For the first part of your air gap install, you'll prepare your private registry in order to be able to install and start using Rancher.
-
-
-
-## Image Sources
-
-Collect the list of images required for Rancher. These steps will require internet access.
-
-{{% tabs %}}
-{{% tab "HA Install" %}}
-The Rancher HA install uses images from 3 sources. Combine the 3 sources into a file named `rancher-images.txt`.
-
-* **Rancher** - Images required by Rancher. Download the `rancher-images.txt` file from [Rancher releases](https://github.com/rancher/rancher/releases) page for the version of Rancher you are installing.
-* **RKE** - Images required by `rke` to install Kubernetes. Run `rke` and add the images to the end of `rancher-images.txt`.
-
- ```plain
- rke config --system-images >> ./rancher-images.txt
- ```
-* **Cert-Manager** - (Optional) If you choose to install with Rancher Self-Signed TLS certificates, you will need the [`cert-manager`](https://github.com/helm/charts/tree/master/stable/cert-manager) image. You may skip this image if you are using you using your own certificates.
-
- Fetch the latest `cert-manager` Helm chart and parse the template for image details.
-
- ```plain
- helm fetch stable/cert-manager
- helm template ./cert-manager-.tgz | grep -oP '(?<=image: ").*(?=")' >> ./rancher-images.txt
- ```
-
-Sort and unique the images list to remove any overlap between the sources.
-
-```plain
-sort -u rancher-images.txt -o rancher-images.txt
-```
-
-{{% /tab %}}
-{{% tab "Single Node" %}}
-All the required images for a Single Node install can be found in the `rancher-images.txt` included with the release of Rancher you are installing.
-
-Download the `rancher-images.txt` from the [Rancher releases](https://github.com/rancher/rancher/releases) page.
-
-{{% /tab %}}
-{{% /tabs %}}
-
-## Publish Images
-
-Once you have the `rancher-images.txt` file populated, publish the images from the list to your private registry.
-
-> **NOTE** This may require up to 20GB of disk space.
-
-1. Browse to the [Rancher releases page](https://github.com/rancher/rancher/releases) and download the following tools for saving and publishing the images.
-
- | Release File | Description |
- | --- | --- |
- | `rancher-save-images.sh` | This script pulls all the images in the `rancher-images.txt` from various public registries and saves all of the images as `rancher-images.tar.gz`. |
- | `rancher-load-images.sh` | This script loads images from the `rancher-images.tar.gz` file and pushes them to your private registry. |
-
-1. From a system with internet access, use the `rancher-save-images.sh` with the `rancher-images.txt` image list to create a tarball of all the required images.
-
- ```plain
- ./rancher-save-images.sh --image-list ./rancher-images.txt
- ```
-
-1. Copy `rancher-load-images.sh`, `rancher-images.txt` and `rancher-images.tar.gz` files to a system that can reach your private registry.
-
- Log into your registry if required.
-
- ```plain
- docker login
- ```
-
- Use `rancher-load-images.sh` to extract, tag and push the images to your private registry.
-
- ```plain
- ./rancher-load-images.sh --image-list ./rancher-images.txt --registry
- ```
-
-### [Next: Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/)
diff --git a/content/rancher/v2.x/en/installation/air-gap-single-node/_index.md b/content/rancher/v2.x/en/installation/air-gap-single-node/_index.md
new file mode 100644
index 00000000000..3f7fd9e6302
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-single-node/_index.md
@@ -0,0 +1,20 @@
+---
+title: "Air Gap: Single Node Install"
+weight: 280
+---
+
+## Prerequisites
+
+Rancher supports air gap installs using a private registry. You must have your own private registry or other means of distributing Docker images to your machine. If you need help with creating a private registry, please refer to the [Docker documentation](https://docs.docker.com/registry/).
+
+>**Note:** If you install Rancher on a single node in an air gap environment, you cannot transition to a HA configuration during future upgrades.
+
+## Installation Outline
+
+- [1. Provision Linux Host]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/provision-host/)
+- [2. Prepare Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/prepare-private-registry/)
+- [3. Choose an SSL Option and Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/install-rancher/)
+- [4. Configure Rancher for Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/)
+
+
+### [Next: Provision Linux Host]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/provision-host/)
diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/config-rancher-for-private-reg/_index.md b/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/_index.md
similarity index 86%
rename from content/rancher/v2.x/en/installation/air-gap-installation/config-rancher-for-private-reg/_index.md
rename to content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/_index.md
index 2f754ce09b1..4d9a28bbfc4 100644
--- a/content/rancher/v2.x/en/installation/air-gap-installation/config-rancher-for-private-reg/_index.md
+++ b/content/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/_index.md
@@ -1,9 +1,10 @@
---
-title: 3—Configuring Rancher for the Private Registry
-weight: 75
+title: "4. Configure Rancher for the Private Registry"
+weight: 400
+aliases:
---
-Rancher needs to be configured to use the private registry in order to provision any [Rancher launched Kubernetes clusters]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/) or [Rancher tools]({{< baseurl >}}/rancher/v2.x/en/tools/) .
+Rancher needs to be configured to use the private registry in order to provision any [Rancher launched Kubernetes clusters]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/) or [Rancher tools]({{< baseurl >}}/rancher/v2.x/en/tools/).
1. Log into Rancher and configure the default admin password.
diff --git a/content/rancher/v2.x/en/installation/air-gap-single-node/install-rancher/_index.md b/content/rancher/v2.x/en/installation/air-gap-single-node/install-rancher/_index.md
new file mode 100644
index 00000000000..4b550200634
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-single-node/install-rancher/_index.md
@@ -0,0 +1,94 @@
+---
+title: "3. Choose an SSL Option and Install Rancher"
+weight: 300
+aliases:
+---
+
+For development and testing in air gap environments, we recommend installing Rancher by running a single Docker container. In this installation scenario, you'll deploy Rancher to your air gap host using an image pulled from your private registry.
+
+For security purposes, SSL (Secure Sockets Layer) is required when using Rancher. SSL secures all Rancher network communication, like when you login or interact with a cluster.
+
+>**Do you want to...**
+>
+>- Configure custom CA root certificate to access your services? See [Custom CA root certificate]({{< baseurl >}}/rancher/v2.x/en/admin-settings/custom-ca-root-certificate/).
+>- Record all transactions with the Rancher API? See [API Auditing]({{< baseurl >}}/rancher/v2.x/en/installation/single-node/#enable-api-audit-log).
+
+
+Choose from the following options:
+
+
+{{% accordion id="option-a" label="Option A-Default Self-Signed Certificate" %}}
+
+If you are installing Rancher in a development or testing environment where identity verification isn't a concern, install Rancher using the self-signed certificate that it generates. This installation option omits the hassle of generating a certificate yourself.
+
+Log into your Linux host, and then run the installation command below. Replace `` with your private registry URL and port. Replace `` with release tag of the [Rancher version]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/) that you want to install.
+
+
+ docker run -d --restart=unless-stopped \
+ -p 80:80 -p 443:443 \
+ /rancher/rancher:
+
+{{% /accordion %}}
+{{% accordion id="option-b" label="Option B-Bring Your Own Certificate: Self-Signed" %}}
+In development or testing environments where your team will access your Rancher server, create a self-signed certificate for use with your install so that your team can verify they're connecting to your instance of Rancher.
+
+>**Prerequisites:**
+>From a computer with an internet connection, create a self-signed certificate using [OpenSSL](https://www.openssl.org/) or another method of your choice.
+>
+>- The certificate files must be in [PEM format]({{< baseurl >}}/rancher/v2.x/en/installation/single-node/#pem).
+>- In your certificate file, include all intermediate certificates in the chain. Order your certificates with your certificate first, followed by the intermediates. For an example, see [SSL FAQ / Troubleshooting]({{< baseurl >}}/rancher/v2.x/en/installation/single-node/#cert-order).
+
+After creating your certificate, run the Docker command below to install Rancher. Use the `-v` flag and provide the path to your certificates to mount them in your container.
+
+When entering the command, use the table below to replace each placeholder.
+
+Placeholder | Description
+------------|-------------
+`` | The path to the directory containing your certificate files.
+`` | The path to your full certificate chain.
+`` | The path to the private key for your certificate.
+`` | The path to the certificate authority's private key.
+`` | Your private registry URL and port.
+`` | The release tag of the [Rancher version]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/) that you want to install.
+
+```
+docker run -d --restart=unless-stopped \
+ -p 80:80 -p 443:443 \
+ -v //:/etc/rancher/ssl/cert.pem \
+ -v //:/etc/rancher/ssl/key.pem \
+ -v //:/etc/rancher/ssl/cacerts.pem \
+ /rancher/rancher:
+```
+
+
+{{% /accordion %}}
+{{% accordion id="option-c" label="Option C-Bring Your Own Certificate: Signed by Recognized CA" %}}
+
+In production environments where you're exposing an app publicly, use a certificate signed by a recognized CA so that your user base doesn't encounter security warnings.
+
+>**Prerequisite:** The certificate files must be in [PEM format]({{< baseurl >}}/rancher/v2.x/en/installation/single-node/#pem).
+
+After obtaining your certificate, run the Docker command below, replacing each placeholder. Because your certificate is signed by a recognized CA, mounting an additional CA certificate file is unnecessary.
+
+When entering the command, use the table below to replace each placeholder.
+
+Placeholder | Description
+------------|-------------
+`` | The path to the directory containing your certificate files.
+`` | The path to your full certificate chain.
+`` | The path to the private key for your certificate.
+`` | Your private registry URL and port. Use the `--no-cacerts` as argument to the container to disable the default CA certificate generated by Rancher.
+`` | The release tag of the [Rancher version]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/) that you want to install.
+
+
+```
+docker run -d --restart=unless-stopped \
+ -p 80:80 -p 443:443 \
+ -v //:/etc/rancher/ssl/cert.pem \
+ -v //:/etc/rancher/ssl/key.pem \
+ /rancher/rancher: --no-cacerts
+```
+
+{{% /accordion %}}
+
+### [Next: Configure Rancher for the Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/config-rancher-for-private-reg/)
\ No newline at end of file
diff --git a/content/rancher/v2.x/en/installation/air-gap-single-node/prepare-private-registry/_index.md b/content/rancher/v2.x/en/installation/air-gap-single-node/prepare-private-registry/_index.md
new file mode 100644
index 00000000000..f7b74daa966
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-single-node/prepare-private-registry/_index.md
@@ -0,0 +1,49 @@
+---
+title: "2. Prepare Private Registry"
+weight: 200
+aliases:
+---
+
+## A. Collect Image Sources
+
+Using a computer with internet access, browse to our [releases page](https://github.com/rancher/rancher/releases) and find the Rancher 2.x.x release that you want to install. Don't download releases marked `rc` or `Pre-release`, as they are not stable for production environments.
+
+
+
+From the release's **Assets** section, download the following three files, which are required to install Rancher in an air gap environment:
+
+
+| Release File | Description |
+| --- | --- |
+| `rancher-images.txt` | This file contains a list of all files needed to install Rancher.
+| `rancher-save-images.sh` | This script pulls all the images in the `rancher-images.txt` from Docker Hub and saves all of the images as `rancher-images.tar.gz`. |
+| `rancher-load-images.sh` | This script loads images from the `rancher-images.tar.gz` file and pushes them to your private registry. |
+
+
+## B. Publish Images
+
+After collecting the release files, publish the images from `rancher-images.txt` to your private registry using the image scripts.
+
+>**Note:** Image publication may require up to 20GB of empty disk space.
+
+1. From a system with internet access, use the `rancher-save-images.sh` with the `rancher-images.txt` image list to create a tarball of all the required images.
+
+ ```plain
+ ./rancher-save-images.sh --image-list ./rancher-images.txt
+ ```
+
+1. Copy `rancher-load-images.sh`, `rancher-images.txt` and `rancher-images.tar.gz` files to the [Linux host]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/provision-host) that you've provisioned by completing the substeps below.
+
+ 1. Log into your registry if required.
+
+ ```plain
+ docker login
+ ```
+
+ 1. Use `rancher-load-images.sh` to extract, tag and push the images to your private registry.
+
+ ```plain
+ ./rancher-load-images.sh --image-list ./rancher-images.txt --registry
+ ```
+
+### [Next: Choose an SSL Option and Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/install-rancher/)
\ No newline at end of file
diff --git a/content/rancher/v2.x/en/installation/air-gap-single-node/provision-host/_index.md b/content/rancher/v2.x/en/installation/air-gap-single-node/provision-host/_index.md
new file mode 100644
index 00000000000..567cf6d0074
--- /dev/null
+++ b/content/rancher/v2.x/en/installation/air-gap-single-node/provision-host/_index.md
@@ -0,0 +1,11 @@
+---
+title: "1. Provision Linux Host"
+weight: 100
+aliases:
+---
+
+Provision a single, air gapped Linux host according to our [Requirements]({{< baseurl >}}/rancher/v2.x/en/installation/requirements) to launch your {{< product >}} Server.
+
+This host should be disconnected from the internet, but should have connectivity with your private registry.
+
+### [Next: Prepare Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/prepare-private-registry/)
diff --git a/content/rancher/v2.x/en/installation/ha/_index.md b/content/rancher/v2.x/en/installation/ha/_index.md
index 827560eacc6..9bfb6cb8e56 100644
--- a/content/rancher/v2.x/en/installation/ha/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/_index.md
@@ -16,6 +16,7 @@ This procedure walks you through setting up a 3-node cluster with RKE and instal
* The Ingress controller will redirect HTTP to HTTPS and terminate SSL/TLS on port TCP/443.
* The Ingress controller will forward traffic to port TCP/80 on the pod in the Rancher deployment.
+HA Rancher install with layer 4 load balancer, depicting SSL termination at ingress controllers

HA Rancher install with Layer 4 load balancer (TCP), depicting SSL termination at ingress controllers
diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md
index babe345da90..6e7646069f4 100644
--- a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md
@@ -5,7 +5,7 @@ weight: 200
Rancher installation is managed using the Helm package manager for Kubernetes. Use `helm` to install the prerequisite and charts to install Rancher.
-> **Note:** For systems without direct internet access see [Installing Rancher - Air Gap]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/) for install details.
+> **Note:** For systems without direct internet access see [Air Gap: High Availability Install]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/).
### Add the Helm Chart Repository
@@ -65,8 +65,6 @@ The default is for Rancher to generate a CA and uses `cert-manager` to issue the
- Replace `` with the repository that you configured in [Add the Helm Chart Repository](#add-the-helm-chart-repository) (i.e. `latest` or `stable`).
- Set the `hostname` to the DNS name you pointed at your load balancer.
->**Using Air Gap?** [Set the `rancherImage` option]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#install-rancher-using-private-registry) in your command, pointing toward your private registry.
-
```
helm install rancher-/rancher \
--name rancher \
@@ -92,9 +90,6 @@ This option uses `cert-manager` to automatically request and renew [Let's Encryp
- Set `hostname` to the public DNS record, set `ingress.tls.source` to `letsEncrypt` and `letsEncrypt.email` to the email address used for communication about your certificate (for example, expiry notices)
-
->**Using Air Gap?** [Set the `rancherImage` option]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#install-rancher-using-private-registry) in your command, pointing toward your private registry.
-
```
helm install rancher-/rancher \
--name rancher \
diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md
index 39e9cf47214..0b09db2884b 100644
--- a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md
@@ -78,7 +78,11 @@ kubectl -n cattle-system create secret generic tls-ca-additional --from-file=ca-
### Private Registry and Air Gap Installs
-See [Installing Rancher - Air Gap]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/) for details on installing Rancher with a private registry.
+For details on installing Rancher with a private registry, see:
+
+- [Air Gap: Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/)
+- [Air Gap: High Availability Install]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/)
+
### External TLS Termination
diff --git a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md
index 851052f68c3..b6bff6add8d 100644
--- a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md
@@ -5,7 +5,7 @@ weight: 190
Use RKE to install Kubernetes with a high availability etcd configuration.
-> **Note:** For systems without direct internet access see [RKE - Air Gap]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#rke) for install details.
+>**Note:** For systems without direct internet access see [Air Gap: High Availability Install]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-high-availability/) for install details.
### Create the `rancher-cluster.yml` File
diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/_index.md
index c8f6933f895..20dd6a9a417 100644
--- a/content/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/_index.md
+++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/api-auditing/_index.md
@@ -5,7 +5,7 @@ aliases:
- /rke/v0.1.x/en/config-options/add-ons/api-auditing/
---
-> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
+>**Important: RKE add-on install is only supported up to Rancher v2.0.8**
>
>Please use the Rancher helm chart to install HA Rancher. For details, see the [HA Install - Installation Outline]({{< baseurl >}}/rancher/v2.x/en/installation/ha/#installation-outline).
>
diff --git a/content/rancher/v2.x/en/installation/references/_index.md b/content/rancher/v2.x/en/installation/references/_index.md
index 9548d9afaed..1b90dc6694b 100644
--- a/content/rancher/v2.x/en/installation/references/_index.md
+++ b/content/rancher/v2.x/en/installation/references/_index.md
@@ -1,6 +1,6 @@
---
title: Port Requirements
-weight: 280
+weight: 300
aliases:
- /rancher/v2.x/en/hosts/amazon/#required-ports-for-rancher-to-work/
---
diff --git a/content/rancher/v2.x/en/installation/single-node/_index.md b/content/rancher/v2.x/en/installation/single-node/_index.md
index dd4fe9dcc18..62ed302c57e 100644
--- a/content/rancher/v2.x/en/installation/single-node/_index.md
+++ b/content/rancher/v2.x/en/installation/single-node/_index.md
@@ -21,7 +21,7 @@ For security purposes, SSL (Secure Sockets Layer) is required when using Rancher
>
>- Use a proxy? See [HTTP Proxy Configuration]({{< baseurl >}}/rancher/v2.x/en/installation/single-node/proxy/)
>- Configure custom CA root certificate to access your services? See [Custom CA root certificate]({{< baseurl >}}/rancher/v2.x/en/admin-settings/custom-ca-root-certificate/)
->- Complete an Air Gap Installation? See [Air Gap](#air-gap)
+>- Complete an Air Gap Installation? See [Air Gap: Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-single-node/)
>- Record all transactions with the Rancher API? See [API Auditing](#api-auditing)
>
@@ -33,7 +33,6 @@ If you are installing Rancher in a development or testing environment where iden
Log into your Linux host, and then run the minimum installation command below.
->**Air Gap User?** [Add your private registry URL]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#add-private-registry-url-to-run-command) before the `rancher/rancher` image.
docker run -d --restart=unless-stopped \
-p 80:80 -p 443:443 \
@@ -55,8 +54,6 @@ After creating your certificate, run the Docker command below to install Rancher
- Replace `` with the directory path to your certificate file.
- Replace ``,``, and `` with your certificate names.
->**Air Gap User?** [Add your private registry URL]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#add-private-registry-url-to-run-command) before the `rancher/rancher` image.
-
```
docker run -d --restart=unless-stopped \
-p 80:80 -p 443:443 \
@@ -81,8 +78,6 @@ After obtaining your certificate, run the Docker command below.
- Use the `--no-cacerts` as argument to the container to disable the default CA certificate generated by Rancher.
->**Air Gap User?** [Add your private registry URL]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#add-private-registry-url-to-run-command) before the `rancher/rancher` image.
-
```
docker run -d --restart=unless-stopped \
-p 80:80 -p 443:443 \
@@ -104,8 +99,6 @@ For production environments, you also have the options of using [Let's Encrypt](
After you fulfill the prerequisites, you can install Rancher using a Let's Encrypt certificate by running the following command. Replace `` with your your domain.
->**Air Gap User?** [Add your private registry URL]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#add-private-registry-url-to-run-command) before the `rancher/rancher` image.
-
docker run -d --restart=unless-stopped \
-p 80:80 -p 443:443 \
rancher/rancher:latest \
@@ -146,7 +139,7 @@ docker run -d --restart=unless-stopped \
### Air Gap
-If you are visiting this page to complete an [Air Gap Installation]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/), you must pre-pend your private registry URL to the server tag when running the installation command in the option that you choose. Add `` with your private registry URL in front of `rancher/rancher:latest`.
+If you are visiting this page to complete an air gap installation, you must pre-pend your private registry URL to the server tag when running the installation command in the option that you choose. Add `` with your private registry URL in front of `rancher/rancher:latest`.
**Example:**
diff --git a/content/rancher/v2.x/en/installation/single-node/single-node-install-external-lb/_index.md b/content/rancher/v2.x/en/installation/single-node/single-node-install-external-lb/_index.md
index acc8ae97f56..1ee8c4fffbb 100644
--- a/content/rancher/v2.x/en/installation/single-node/single-node-install-external-lb/_index.md
+++ b/content/rancher/v2.x/en/installation/single-node/single-node-install-external-lb/_index.md
@@ -47,9 +47,6 @@ If you elect to use a self-signed certificate to encrypt communication, you must
1. While running the Docker command to deploy Rancher, point Docker toward your CA certificate file.
- >**Air Gap User?** [Add your private registry URL]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#add-private-registry-url-to-run-command) before the `rancher/rancher` image tag.
-
-
```
docker run -d --restart=unless-stopped \
-p 80:80 -p 443:443 \
@@ -71,8 +68,6 @@ If you use a certificate signed by a recognized CA, installing your certificate
1. Enter the following command.
- >**Air Gap User?** [Add your private registry URL]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-rancher/#add-private-registry-url-to-run-command) before the `rancher/rancher` image tag.
-
```
docker run -d --restart=unless-stopped \
-p 80:80 -p 443:443 \
diff --git a/src/img/rancher/choose-release-version.png b/src/img/rancher/choose-release-version.png
new file mode 100644
index 00000000000..6a2ea34984a
Binary files /dev/null and b/src/img/rancher/choose-release-version.png differ