Skip to content

Manual backport 1.15.x of #17311 #17356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hanshasselberg merged 4 commits into from
May 15, 2023
Merged

Manual backport 1.15.x of #17311 #17356

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f865e03
[CC-4856] Add cloud stanza documentation
May 11, 2023
abfa7a3
Add environment variables to cloud descriptions
May 12, 2023
cf8a0a9
reorder
hanshasselberg May 15, 2023
cc44a63
Merge branch 'release/1.15.x' into hans/manual_backport_1_15_17311
hanshasselberg May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions website/content/docs/agent/config/config-files.mdx
View file
Open in desktop
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