From 5137479816d481aeb6f361f1323eb1bfa3820971 Mon Sep 17 00:00:00 2001 From: trujillo-adam Date: Tue, 22 Jun 2021 10:33:11 -0700 Subject: [PATCH] docs: linked license faq to new section about upgrading to 1.10.x; also removed upgrade req details and table in faq --- .../content/docs/enterprise/license/faq.mdx | 51 ++----------------- 1 file changed, 3 insertions(+), 48 deletions(-) diff --git a/website/content/docs/enterprise/license/faq.mdx b/website/content/docs/enterprise/license/faq.mdx index 249cda1cca..a1169ee694 100644 --- a/website/content/docs/enterprise/license/faq.mdx +++ b/website/content/docs/enterprise/license/faq.mdx @@ -23,54 +23,9 @@ This will no longer work since each server must be able to find a valid license ## Q: What are the upgrade requirements? All customers on Consul Enterprise 1.8/1.9 must first upgrade their agents to the latest patch release. -The license file must also be set in an environment variable or file path. Otherwise, -the Consul agents will fail to retrieve the license with a valid agent token. -The upgrade process varies if ACLs are enabled or disabled in the cluster. The following table and corresponding sections describe common 1.10.0 upgrade scenarios. - -| Client Version | Server Version | ACLs | Guidance | -| -------------- | -------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------- | -| 1.9.x | 1.9.x | Enabled | See [Upgrade Path for Consul Clients and Servers 1.9.x - ACLs Enabled](faq#upgrade-path-for-consul-clients-and-servers-1-9-x-acls-enabled). | -| 1.9.x | 1.9.x | Disabled | See [Upgrade Path for Consul Clients and Servers 1.9.x - ACLs Disabled](faq#upgrade-path-for-consul-clients-and-servers-1-9-x-acls-disabled). | -| 1.8.x | 1.8.x | Enabled | See [Upgrade Path for Consul Clients and Servers 1.8.x - ACLs Disabled](faq#upgrade-path-for-consul-clients-and-servers-1-8-x-acls-enabled). | -| 1.8.x | 1.8.x | Disabled | See [Upgrade Path for Consul Clients and Servers 1.8.x - ACLs Disabled](faq#upgrade-path-for-consul-clients-and-servers-1-8-x-acls-disabled). | - -For Consul clients and servers older than 1.8, follow the instructions for [upgrading to specific versions](/docs/upgrading/upgrade-specific) to install Consul 1.8.X on clients and servers before performing one of the following upgrade scenarios. - -### Upgrade Path for Consul Clients and Servers 1.9.x - ACLs Enabled - -1. Upgrade Consul servers to the latest version of 1.9.x and confiure the license file or set the license environment variable. -1. Upgrade Consul clients to the latest version of 1.9.x and configure the license file or set the license environment variable. -1. Upgrade Consul servers to 1.10.0. -1. Upgrade Consul clients to 1.10.0. -1. Upgrade the Snapshot agent to 1.10.0. - -### Upgrade Path for Consul Clients and Servers 1.9.x - ACLs Disabled - -1. Upgrade Consul servers to the latest version of 1.9.x and confiure the license file or set the license environment variable. -1. Upgrade Consul clients to the latest version of 1.9.x and confiure the license file or set the license environment variable. -1. Upgrade Snapshot agents to the latest version of 1.9.x and confiure the license file or set the license environment variable. -1. Upgrade Consul servers to 1.10.0. -1. Upgrade Consul clients to 1.10.0. -1. Upgrade the Snapshot agent to 1.10.0. - -### Upgrade Path for Consul Clients and Servers 1.8.x - ACLs Enabled - -1. Configure the license file or set the license environment variable for Consul clients and servers. -1. Upgrade Consul servers to the latest version of 1.8.x. -1. Upgrade Consul clients to the latest version of 1.8.x. -1. Upgrade Consul servers to 1.10.0 and confiure the license file or set the license environment variable. -1. Upgrade Consul clients to 1.10.0 and confiure the license file or set the license environment variable. -1. Upgrade the Snapshot agent to 1.10.0 and confiure the license file or set the license environment variable. - -### Upgrade Path for Consul Clients and Servers 1.8.x - ACLs Disabled - -1. Configure the license file or set the license environment variable for Consul clients and servers. -1. Upgrade Consul servers to the latest version of 1.8.x and confiure the license file or set the license environment variable. -1. Upgrade Consul clients to the latest version of 1.8.x and confiure the license file or set the license environment variable. -1. Upgrade Snapshot Agents to the latest version of 1.8.x and confiure the license file or set the license environment variable. -1. Upgrade Consul servers to 1.10.0. -1. Upgrade Consul clients to 1.10.0. -1. Upgrade the Snapshot agent to 1.10.0. +The license file must also be set in an environment variable or file path, otherwise the Consul agents will fail to retrieve the license with a valid agent token. +The upgrade process varies if ACLs are enabled or disabled in the cluster. +Refer to the instructions on [upgrading to 1.10.x](/docs/upgrading/instructions/upgrade-to-1-10-x) for details. ## Q: Is there a tutorial available for the license configuration steps?