From 39e273a64535576a7e93f186c20fe85738835642 Mon Sep 17 00:00:00 2001 From: Jeremy Jacobson Date: Thu, 11 May 2023 11:39:35 -0700 Subject: [PATCH 1/2] [CC-4856] Add cloud stanza documentation --- .../content/docs/agent/config/config-files.mdx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/website/content/docs/agent/config/config-files.mdx b/website/content/docs/agent/config/config-files.mdx index e13cd6b4e369..d17e4b56d9cb 100644 --- a/website/content/docs/agent/config/config-files.mdx +++ b/website/content/docs/agent/config/config-files.mdx @@ -1088,6 +1088,22 @@ Refer to the [formatting specification](https://golang.org/pkg/time/#ParseDurati - `bootstrap_expect` Equivalent to the [`-bootstrap-expect` command-line flag](/consul/docs/agent/config/cli-flags#_bootstrap_expect). +## HCP Parameters + +- `cloud` This object specifies settings for connecting to HCP. This was added in Consul 1.14 + + - `client_id` The OAuth2 client ID for authentication with HCP + + - `client_secret` The OAuth2 client secret for authentication with HCP + + - `resource_id` The HCP resource identifier + + - `hostname` (optional) The HCP hostname + + - `auth_url` (optional) The HCP authentication URL + + - `scada_address` (optional) The HCP SCADA address + ## Service Mesh Parameters ((#connect-parameters)) The noun _connect_ is used throughout this documentation to refer to the connect From f563ed01b019a8cc965fa88b7f7423f90706c366 Mon Sep 17 00:00:00 2001 From: Jeremy Jacobson Date: Fri, 12 May 2023 09:48:18 -0700 Subject: [PATCH 2/2] Add environment variables to cloud descriptions --- .../content/docs/agent/config/config-files.mdx | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/website/content/docs/agent/config/config-files.mdx b/website/content/docs/agent/config/config-files.mdx index d17e4b56d9cb..b19991fe04db 100644 --- a/website/content/docs/agent/config/config-files.mdx +++ b/website/content/docs/agent/config/config-files.mdx @@ -1088,21 +1088,15 @@ Refer to the [formatting specification](https://golang.org/pkg/time/#ParseDurati - `bootstrap_expect` Equivalent to the [`-bootstrap-expect` command-line flag](/consul/docs/agent/config/cli-flags#_bootstrap_expect). -## HCP Parameters +## Self-managed HCP Parameters -- `cloud` This object specifies settings for connecting to HCP. This was added in Consul 1.14 +- `cloud` This object specifies settings for connecting self-managed clusters to HCP. This was added in Consul 1.14 - - `client_id` The OAuth2 client ID for authentication with HCP + - `client_id` The OAuth2 client ID for authentication with HCP. This can be overridden using the `HCP_CLIENT_ID` environment variable. - - `client_secret` The OAuth2 client secret for authentication with HCP + - `client_secret` The OAuth2 client secret for authentication with HCP. This can be overridden using the `HCP_CLIENT_SECRET` environment variable. - - `resource_id` The HCP resource identifier - - - `hostname` (optional) The HCP hostname - - - `auth_url` (optional) The HCP authentication URL - - - `scada_address` (optional) The HCP SCADA address + - `resource_id` The HCP resource identifier. This can be overridden using the `HCP_RESOURCE_ID` environment variable. ## Service Mesh Parameters ((#connect-parameters))