From c650deb0764b3c549e3e2b92c5c44ff201795c20 Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Fri, 6 Feb 2015 14:52:45 -0800 Subject: [PATCH] website: Document new options --- .../source/docs/agent/options.html.markdown | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/website/source/docs/agent/options.html.markdown b/website/source/docs/agent/options.html.markdown index 43f9dc55bf..0e0f132d84 100644 --- a/website/source/docs/agent/options.html.markdown +++ b/website/source/docs/agent/options.html.markdown @@ -40,6 +40,17 @@ The options below are all specified on the command-line. If this address is not routable, the node will be in a constant flapping state as other nodes will treat the non-routability as a failure. +* `-atlas` - This flag enables [Atlas](https://atlas.hashicorp.com) integration. + It is used to provide the Atlas infrastructure name and the SCADA connection. + This enables Atlas features such as the dashboard and node auto joining. + +* `-atlas-join` - When set, enables auto-join via Atlas. Atlas will track the most + recent members to join the infrastructure named by `-atlas` and automatically + join them on start. For servers, the LAN and WAN pool are both joined. + +* `-atlas-token` - Provides the Atlas API authentication token. This can also be provided + using the `ATLAS_TOKEN` environment variable. Required for use with Atlas. + * `-bootstrap` - This flag is used to control if a server is in "bootstrap" mode. It is important that no more than one server *per* data center be running in this mode. Technically, a server in bootstrap mode is allowed to self-elect as the Raft leader. It is important that only a single node is in this mode; @@ -260,6 +271,16 @@ definitions support being updated during a reload. * `advertise_addr` - Equivalent to the [`-advertise` command-line flag](#advertise). +* `atlas_acl_token` - When provided, any requests made by Atlas will use this ACL + token unless explicitly overriden. When not provided the `acl_token` is used. + This can be set to 'anonymous' to reduce permission below that of `acl_token`. + +* `atlas_infrastructure` - Equivalent to the [`-atlas` command-line flag](#atlas). + +* `atlas_join` - Equivalent to the [`-atlas-join` command-line flag](#atlas_join). + +* `atlas_token` - Equivalent to the [`-atlas-token` command-line flag](#atlas_token). + * `bootstrap` - Equivalent to the [`-bootstrap` command-line flag](#bootstrap_anchor). * `bootstrap_expect` - Equivalent to the [`-bootstrap-expect` command-line flag](#bootstrap_expect).