Skip to content

Commit

Permalink
Manual backport 1.15.x of #17311 (#17356)
Browse files Browse the repository at this point in the history
* [CC-4856] Add cloud stanza documentation

* Add environment variables to cloud descriptions

* reorder

---------

Co-authored-by: Jeremy Jacobson <jeremy.jacobson@hashicorp.com>
  • Loading branch information
hanshasselberg and jjacobson93 authored May 15, 2023
1 parent 64c29e5 commit 3967e33
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions website/content/docs/agent/config/config-files.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -1527,6 +1527,16 @@ subsystem that provides Consul's service mesh capabilities.
part of the cluster before declaring it dead, giving that suspect node more time
to refute if it is indeed still alive. The default is 6.

## Self-managed HCP Parameters

- `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. This can be overridden using the `HCP_CLIENT_ID` environment variable.

- `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. This can be overridden using the `HCP_RESOURCE_ID` environment variable.

## Join Parameters

- `rejoin_after_leave` Equivalent to the [`-rejoin` command-line flag](/consul/docs/agent/config/cli-flags#_rejoin).
Expand Down

0 comments on commit 3967e33

Please sign in to comment.