From b58515c38479b0cdc5ed28e289d40ef5903f3c11 Mon Sep 17 00:00:00 2001 From: Jason Greathouse Date: Wed, 18 Jul 2018 14:14:09 +1000 Subject: [PATCH] renames suggested by ahmad --- content/rancher/v2.x/en/installation/_index.md | 8 ++------ .../v2.x/en/installation/{ha-install => ha}/_index.md | 4 ++-- .../{ha-install => ha}/create-nodes-lb/_index.md | 2 +- .../{ha-install => ha}/create-nodes-lb/nlb/_index.md | 0 .../installation/{ha-install => ha}/helm-init/_index.md | 2 +- .../helm-rancher-install => ha/helm-rancher}/_index.md | 0 .../helm-rancher}/chart-options/_index.md | 0 .../helm-rancher}/tls-secrets/_index.md | 0 .../helm-rancher}/troubleshooting/_index.md | 0 .../kubernetes-rke}/_index.md | 0 .../kubernetes-rke}/troubleshooting/_index.md | 0 .../migrating-from-rke-all-in-one/_index.md | 2 +- .../{ha-install => ha}/rke-all-in-one/_index.md | 4 ++-- .../rke-all-in-one/layer-4-lb}/_index.md | 0 .../rke-all-in-one/layer-4-lb}/nlb/_index.md | 0 .../rke-all-in-one/layer-7-lb}/_index.md | 0 .../rke-all-in-one/layer-7-lb}/alb/_index.md | 0 .../rke-all-in-one/layer-7-lb}/nginx/_index.md | 0 .../troubleshooting/404-default-backend/_index.md | 0 .../rke-all-in-one/troubleshooting/_index.md | 0 .../troubleshooting/generic-troubleshooting/_index.md | 0 .../troubleshooting/job-complete-status/_index.md | 0 .../troubleshooting/ssh-tunneling/_index.md | 0 .../{single-node-install => single-node}/_index.md | 2 +- .../advanced-options}/_index.md | 0 .../advanced-options}/air-gap-installation/_index.md | 0 .../advanced-options}/proxy-configuration/_index.md | 0 .../single-node-install-external-lb/_index.md | 0 28 files changed, 10 insertions(+), 14 deletions(-) rename content/rancher/v2.x/en/installation/{ha-install => ha}/_index.md (94%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/create-nodes-lb/_index.md (94%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/create-nodes-lb/nlb/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/helm-init/_index.md (97%) rename content/rancher/v2.x/en/installation/{ha-install/helm-rancher-install => ha/helm-rancher}/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install/helm-rancher-install => ha/helm-rancher}/chart-options/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install/helm-rancher-install => ha/helm-rancher}/tls-secrets/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install/helm-rancher-install => ha/helm-rancher}/troubleshooting/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install/install-kubernetes-rke => ha/kubernetes-rke}/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install/install-kubernetes-rke => ha/kubernetes-rke}/troubleshooting/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/migrating-from-rke-all-in-one/_index.md (97%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/rke-all-in-one/_index.md (86%) rename content/rancher/v2.x/en/installation/{ha-install/rke-all-in-one/install-layer-4-lb => ha/rke-all-in-one/layer-4-lb}/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install/rke-all-in-one/install-layer-4-lb => ha/rke-all-in-one/layer-4-lb}/nlb/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install/rke-all-in-one/install-layer-7-lb => ha/rke-all-in-one/layer-7-lb}/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install/rke-all-in-one/install-layer-7-lb => ha/rke-all-in-one/layer-7-lb}/alb/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install/rke-all-in-one/install-layer-7-lb => ha/rke-all-in-one/layer-7-lb}/nginx/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/rke-all-in-one/troubleshooting/404-default-backend/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/rke-all-in-one/troubleshooting/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/rke-all-in-one/troubleshooting/generic-troubleshooting/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/rke-all-in-one/troubleshooting/job-complete-status/_index.md (100%) rename content/rancher/v2.x/en/installation/{ha-install => ha}/rke-all-in-one/troubleshooting/ssh-tunneling/_index.md (100%) rename content/rancher/v2.x/en/installation/{single-node-install => single-node}/_index.md (99%) rename content/rancher/v2.x/en/installation/{single-node-install/advanced-install-options => single-node/advanced-options}/_index.md (100%) rename content/rancher/v2.x/en/installation/{single-node-install/advanced-install-options => single-node/advanced-options}/air-gap-installation/_index.md (100%) rename content/rancher/v2.x/en/installation/{single-node-install/advanced-install-options => single-node/advanced-options}/proxy-configuration/_index.md (100%) rename content/rancher/v2.x/en/installation/{single-node-install/advanced-install-options => single-node/advanced-options}/single-node-install-external-lb/_index.md (100%) diff --git a/content/rancher/v2.x/en/installation/_index.md b/content/rancher/v2.x/en/installation/_index.md index 1c6f3ecf56f..62fdbccf749 100644 --- a/content/rancher/v2.x/en/installation/_index.md +++ b/content/rancher/v2.x/en/installation/_index.md @@ -6,20 +6,16 @@ This section contains instructions for installing Rancher in development and pro ### Installation Options -- [Single Node Installation](single-node-install/) +- [Single Node Installation](single-node/) Install Rancher on a single Linux host. -- [High Availability Installation](ha-server-install-helm/) +- [High Availability Installation](ha/) This install scenario creates a new Kubernetes cluster dedicated to running Rancher Server in a high-availability (HA) configuration. ### Reference -- [Images required for Air Gap Installation](air-gap-images/) - - Required images and configuration to install Rancher Server in an environment without direct Internet access. - - [Port Requirements](references/) List of required ports you must open to operate Rancher. diff --git a/content/rancher/v2.x/en/installation/ha-install/_index.md b/content/rancher/v2.x/en/installation/ha/_index.md similarity index 94% rename from content/rancher/v2.x/en/installation/ha-install/_index.md rename to content/rancher/v2.x/en/installation/ha/_index.md index a638152eecf..0f6ab3746fc 100644 --- a/content/rancher/v2.x/en/installation/ha-install/_index.md +++ b/content/rancher/v2.x/en/installation/ha/_index.md @@ -30,9 +30,9 @@ The following CLI tools are required for this install. Please make sure these to ## Installation Outline 1. [Create Nodes and Load Balancer](create-nodes-lb/) -1. [Install Kubernetes with RKE](install-kubernetes-rke/) +1. [Install Kubernetes with RKE](kubernetes-rke/) 1. [Initialize Helm (tiller)](helm-init/) -1. [Install Rancher](helm-rancher-install/) +1. [Install Rancher](helm-rancher/) ## Additional Install Options diff --git a/content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/_index.md b/content/rancher/v2.x/en/installation/ha/create-nodes-lb/_index.md similarity index 94% rename from content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/_index.md rename to content/rancher/v2.x/en/installation/ha/create-nodes-lb/_index.md index a9f46cdf326..60f1135c858 100644 --- a/content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/_index.md +++ b/content/rancher/v2.x/en/installation/ha/create-nodes-lb/_index.md @@ -45,4 +45,4 @@ Configure a load balancer as a basic Layer 4 tcp forwarder. The exact configurat
-### [Next: Install Kubernetes with RKE](../install-kubernetes-rke/) \ No newline at end of file +### [Next: Install Kubernetes with RKE](../kubernetes-rke/) \ No newline at end of file diff --git a/content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/nlb/_index.md b/content/rancher/v2.x/en/installation/ha/create-nodes-lb/nlb/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/nlb/_index.md rename to content/rancher/v2.x/en/installation/ha/create-nodes-lb/nlb/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md similarity index 97% rename from content/rancher/v2.x/en/installation/ha-install/helm-init/_index.md rename to content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 6370143a30a..c28458fa89c 100644 --- a/content/rancher/v2.x/en/installation/ha-install/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -65,4 +65,4 @@ helm init --service-account tiller > NOTE: This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. -### [Next: Install Rancher](../helm-rancher-install/) \ No newline at end of file +### [Next: Install Rancher](../helm-rancher/) \ No newline at end of file diff --git a/content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/_index.md rename to content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/chart-options/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/chart-options/_index.md rename to content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/tls-secrets/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/tls-secrets/_index.md rename to content/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/troubleshooting/_index.md rename to content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/install-kubernetes-rke/_index.md b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/install-kubernetes-rke/_index.md rename to content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/install-kubernetes-rke/troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/troubleshooting/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/install-kubernetes-rke/troubleshooting/_index.md rename to content/rancher/v2.x/en/installation/ha/kubernetes-rke/troubleshooting/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/migrating-from-rke-all-in-one/_index.md b/content/rancher/v2.x/en/installation/ha/migrating-from-rke-all-in-one/_index.md similarity index 97% rename from content/rancher/v2.x/en/installation/ha-install/migrating-from-rke-all-in-one/_index.md rename to content/rancher/v2.x/en/installation/ha/migrating-from-rke-all-in-one/_index.md index 5f7ab068ab6..b6b750a1dbb 100644 --- a/content/rancher/v2.x/en/installation/ha-install/migrating-from-rke-all-in-one/_index.md +++ b/content/rancher/v2.x/en/installation/ha/migrating-from-rke-all-in-one/_index.md @@ -53,4 +53,4 @@ kubectl -n cattle-system delete serviceaccount cattle-admin From here follow the standard install steps. * [3 - Initialize Helm (Install tiller)](../helm-init/) -* [4 - Install Rancher](../helm-rancher-install/) +* [4 - Install Rancher](../helm-rancher/) diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/_index.md similarity index 86% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/_index.md index 25e835effd2..fda319a3c4e 100644 --- a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/_index.md +++ b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/_index.md @@ -5,6 +5,6 @@ weight: 276 Rancher can be installed by providing the appropriate Kubernetes manifest configurations to RKE's `addons` feature. See the following instructions for examples appropriate to your environment. -* [High Availability Installation with External Load Balancer (TCP/Layer 4)](install-layer-4-lb/) -* [High Availability Installation with External Load Balancer (HTTPS/Layer 7)](install-layer-7-lb/) +* [High Availability Installation with External Load Balancer (TCP/Layer 4)](layer-4-lb/) +* [High Availability Installation with External Load Balancer (HTTPS/Layer 7)](layer-7-lb/) * [Troubleshooting RKE All-In-One Installs](troubleshooting/) diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-4-lb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-4-lb/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-4-lb/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-4-lb/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-4-lb/nlb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-4-lb/nlb/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-4-lb/nlb/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-4-lb/nlb/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-7-lb/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-7-lb/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/alb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-7-lb/alb/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/alb/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-7-lb/alb/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/nginx/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-7-lb/nginx/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/nginx/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/layer-7-lb/nginx/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/404-default-backend/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/404-default-backend/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/404-default-backend/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/404-default-backend/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/generic-troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/generic-troubleshooting/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/generic-troubleshooting/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/generic-troubleshooting/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/job-complete-status/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/job-complete-status/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/job-complete-status/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/job-complete-status/_index.md diff --git a/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/ssh-tunneling/_index.md b/content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/ssh-tunneling/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/ssh-tunneling/_index.md rename to content/rancher/v2.x/en/installation/ha/rke-all-in-one/troubleshooting/ssh-tunneling/_index.md diff --git a/content/rancher/v2.x/en/installation/single-node-install/_index.md b/content/rancher/v2.x/en/installation/single-node/_index.md similarity index 99% rename from content/rancher/v2.x/en/installation/single-node-install/_index.md rename to content/rancher/v2.x/en/installation/single-node/_index.md index 0afffbf944c..b895c5aa800 100644 --- a/content/rancher/v2.x/en/installation/single-node-install/_index.md +++ b/content/rancher/v2.x/en/installation/single-node/_index.md @@ -5,7 +5,7 @@ weight: 250 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. >**Want to use an external load balancer?** -> See [Single Node Installation with an External Load Balancer](advanced-install-options/single-node-install-external-lb) instead. +> See [Single Node Installation with an External Load Balancer](advanced-options/single-node-install-external-lb) instead. ## Installation Outline diff --git a/content/rancher/v2.x/en/installation/single-node-install/advanced-install-options/_index.md b/content/rancher/v2.x/en/installation/single-node/advanced-options/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/single-node-install/advanced-install-options/_index.md rename to content/rancher/v2.x/en/installation/single-node/advanced-options/_index.md diff --git a/content/rancher/v2.x/en/installation/single-node-install/advanced-install-options/air-gap-installation/_index.md b/content/rancher/v2.x/en/installation/single-node/advanced-options/air-gap-installation/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/single-node-install/advanced-install-options/air-gap-installation/_index.md rename to content/rancher/v2.x/en/installation/single-node/advanced-options/air-gap-installation/_index.md diff --git a/content/rancher/v2.x/en/installation/single-node-install/advanced-install-options/proxy-configuration/_index.md b/content/rancher/v2.x/en/installation/single-node/advanced-options/proxy-configuration/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/single-node-install/advanced-install-options/proxy-configuration/_index.md rename to content/rancher/v2.x/en/installation/single-node/advanced-options/proxy-configuration/_index.md diff --git a/content/rancher/v2.x/en/installation/single-node-install/advanced-install-options/single-node-install-external-lb/_index.md b/content/rancher/v2.x/en/installation/single-node/advanced-options/single-node-install-external-lb/_index.md similarity index 100% rename from content/rancher/v2.x/en/installation/single-node-install/advanced-install-options/single-node-install-external-lb/_index.md rename to content/rancher/v2.x/en/installation/single-node/advanced-options/single-node-install-external-lb/_index.md