From beea336a4e4962124692091633ee46b73cc00aff Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 10 May 2018 11:45:08 -0700 Subject: [PATCH] restructed install section now that we don't have separate load balancer and ssl tasks --- .../rancher/v2.x/en/installation/_index.md | 24 ++++++++----------- .../ha-server-install/_index.md | 6 ++--- .../server-installation/_index.md | 14 ----------- .../single-node-install-external-lb/_index.md | 8 +++---- .../single-node-install/_index.md | 7 +++--- layouts/shortcodes/requirements_hardware.html | 2 +- 6 files changed, 21 insertions(+), 40 deletions(-) rename content/rancher/v2.x/en/installation/{server-installation => }/ha-server-install/_index.md (98%) delete mode 100644 content/rancher/v2.x/en/installation/server-installation/_index.md rename content/rancher/v2.x/en/installation/{server-installation => }/single-node-install-external-lb/_index.md (95%) rename content/rancher/v2.x/en/installation/{server-installation => }/single-node-install/_index.md (96%) diff --git a/content/rancher/v2.x/en/installation/_index.md b/content/rancher/v2.x/en/installation/_index.md index 8ccb6e465ef..d8e510591f4 100644 --- a/content/rancher/v2.x/en/installation/_index.md +++ b/content/rancher/v2.x/en/installation/_index.md @@ -4,26 +4,22 @@ weight: 50 --- # Installation -This section contains instructions for installing Rancher in development and production environments. Review the section below to identify your use case. Then follow the linked procedures. +This section contains instructions for installing Rancher in development and production environments. -## Objectives +Choose from the following installation options: -1. Install Rancher Server. We have instructions for these use cases. Pick the right one for you: +- [Single Node Installation]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install) - - [Single Node Installation]({{< baseurl >}}/rancher/v2.x/en/installation/server-installation/single-node-install): In this simple install scenario, you install Rancher on a single Linux host. + In this simple install scenario, you install Rancher on a single Linux host. - - [Single Node Install With External Loadbalancer]({{< baseurl >}}/rancher/v2.x/en/installation/server-installation/single-node-install-external-lb): In this scenario, you install Rancher on a single Linux host and access it using an external loadbalancer/proxy. +- [Single Node Installation with External Loadbalancer]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install-external-lb) - - [High Availablity Installation]({{< baseurl >}}/rancher/v2.x/en/installation/server-installation/ha-server-install/): This install scenario creates a new Kubernetes cluster dedicated to running Rancher Server in a high-availabilty (HA) configuration. + In this scenario, you install Rancher on a single Linux host and access it using an external loadbalancer/proxy. - - [Air Gap Installation]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/): We also have instructions for a more specialized use case where you install Rancher Server in an environment without an Internet connection. +- [High Availablity Installation]({{< baseurl >}}/rancher/v2.x/en/installation/ha-server-install/) - + We also have instructions for a more specialized use case where you install Rancher Server in an environment without an Internet connection. diff --git a/content/rancher/v2.x/en/installation/server-installation/ha-server-install/_index.md b/content/rancher/v2.x/en/installation/ha-server-install/_index.md similarity index 98% rename from content/rancher/v2.x/en/installation/server-installation/ha-server-install/_index.md rename to content/rancher/v2.x/en/installation/ha-server-install/_index.md index 1d6afdab8cd..7eb6efa6554 100644 --- a/content/rancher/v2.x/en/installation/server-installation/ha-server-install/_index.md +++ b/content/rancher/v2.x/en/installation/ha-server-install/_index.md @@ -1,8 +1,8 @@ --- -title: High Availability Install +title: High Availability Installation weight: 275 --- -# High Availability Install +# High Availability Installation This set of instructions creates a new Kubernetes cluster dedicated to running Rancher in a high-availability (HA) configuration. This procedure walks you through setting up a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on: @@ -130,7 +130,7 @@ Certificates can be configured by using base64 encoded strings in the config fil >**Note:** > If you are using Certificate Signed By A Recognized Certificate Authority, [click here](#certificate-signed-by-a-recognized-certificate-authority) to proceed. -If you are using a Self Signed Certificate, you will need to generate base64 encoded strings for each of your files (Certificate file, Certificate Key file, and CA certificate file). +If you are using a Self Signed Certificate, you will need to generate base64 encoded strings for each of your files (Certificate file, Certificate Key file, and CA certificate file). Make sure that your certificate file includes all the intermediate certificates in the chain, the order of certificates in this case is first your own certificate, followed by the intermediates. In the `kind: Secret` with `name: cattle-keys-ingress`: diff --git a/content/rancher/v2.x/en/installation/server-installation/_index.md b/content/rancher/v2.x/en/installation/server-installation/_index.md deleted file mode 100644 index 5894aff15ae..00000000000 --- a/content/rancher/v2.x/en/installation/server-installation/_index.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: Rancher Server Installation -weight: 225 ---- - -# Rancher Server Installation - -This section contains instructions for setting up Rancher Server in development and production environments. The section also contains supplementary documentation for configuring load balancers and SSL certificates to work with Rancher. - -Choose from the options below: - -- [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/server-installation/single-node-install/) -- [Single Node Install with External Loadbalancer]({{< baseurl >}}/rancher/v2.x/en/installation/server-installation/single-node-install-external-lb/) -- [High-Availability Server Install]({{< baseurl >}}/rancher/v2.x/en/installation/server-installation/ha-server-install/) diff --git a/content/rancher/v2.x/en/installation/server-installation/single-node-install-external-lb/_index.md b/content/rancher/v2.x/en/installation/single-node-install-external-lb/_index.md similarity index 95% rename from content/rancher/v2.x/en/installation/server-installation/single-node-install-external-lb/_index.md rename to content/rancher/v2.x/en/installation/single-node-install-external-lb/_index.md index 3d9eff9bfea..88b5c3866fb 100644 --- a/content/rancher/v2.x/en/installation/server-installation/single-node-install-external-lb/_index.md +++ b/content/rancher/v2.x/en/installation/single-node-install-external-lb/_index.md @@ -1,14 +1,14 @@ --- -title: Single Node Install with External Load Balancer +title: Single Node Installation with External Load Balancer weight: 260 --- -# Single Node Install with External Load Balancer +# Single Node Installation with External Load Balancer For development environments, we recommend installing Rancher by running a single Docker container. In this installation scenario, you'll install Docker on a single Linux host, and then install Rancher on your host using a single Docker container. >**Note:** -> If you want don't want to use an external load balancer, please see [Single Node Install]({{< baseurl >}}/rancher/v2.x/en/installation/server-installation/single-node-install/). +> If you want don't want to use an external load balancer, please see [Single Node Installation]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install/). ## Provision Linux Host @@ -23,7 +23,7 @@ Provision a single Linux host to launch your {{< product >}} Server. {{< requirements_software >}} >**Note:** ->- `rancher/rancher` is hosted on [DockerHub](https://hub.docker.com/r/rancher/rancher/tags/). If you don't have access to DockerHub, or you are installing Rancher without an internet connection, refer to [Installing From a Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-from-private-registry/).

+>- `rancher/rancher` is hosted on [DockerHub](https://hub.docker.com/r/rancher/rancher/tags/). If you don't have access to DockerHub, or you are installing Rancher without an internet connection, refer to [Installing From a Private Registry]({{< baseurl >}}/rancher/v2.x/en/installation/air-gap-installation/install-from-private-registry/).
>- For a list of other Rancher Server tags available, refer to [Rancher Server Tags]({{< baseurl >}}/rancher/v2.x/en/installation/server-tags/). ## Configuration diff --git a/content/rancher/v2.x/en/installation/server-installation/single-node-install/_index.md b/content/rancher/v2.x/en/installation/single-node-install/_index.md similarity index 96% rename from content/rancher/v2.x/en/installation/server-installation/single-node-install/_index.md rename to content/rancher/v2.x/en/installation/single-node-install/_index.md index bfe35231393..5c04edb5ede 100644 --- a/content/rancher/v2.x/en/installation/server-installation/single-node-install/_index.md +++ b/content/rancher/v2.x/en/installation/single-node-install/_index.md @@ -1,16 +1,16 @@ --- -title: Single Node Install +title: Single Node Installation weight: 250 description: For development environments, we recommend installing Rancher by deploying a single Docker container. --- -# Single Node Install +# Single Node Installation For development environments, we recommend installing Rancher by running a single Docker container. In this installation scenario, you'll install Docker on a single Linux host, and then install Rancher on your host using a single Docker container. >**Note:** -> If you want to use an external loadbalancer, please see [Single Node Install with an External Loadbalancer]({{< baseurl >}}/rancher/v2.x/en/installation/server-installation/single-node-install-external-lb/). +> If you want to use an external loadbalancer, please see [Single Node Installation with an External Loadbalancer]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install-external-lb/). ## Provision Linux Host @@ -116,4 +116,3 @@ $ sudo docker run -d --restart=unless-stopped -p 80:80 -p 443:443 rancher/ranche ## Persistent data {{< persistentdata >}} - diff --git a/layouts/shortcodes/requirements_hardware.html b/layouts/shortcodes/requirements_hardware.html index 7c7023df8e3..eb30462a6c2 100644 --- a/layouts/shortcodes/requirements_hardware.html +++ b/layouts/shortcodes/requirements_hardware.html @@ -1,7 +1,7 @@

Hardware Requirements

-

Hardware requirements scale based on the size of your Rancher deployment.

+

Hardware requirements scale based on the size of your Rancher deployment. Provision each individual node according to the requirements.

Deployment Size