From efc2d316c10415691bf04ab38058cb48efe06bc2 Mon Sep 17 00:00:00 2001 From: ketzacoatl Date: Wed, 1 Jul 2015 15:34:35 -0400 Subject: [PATCH] Minor improvement to `acl_master_token` docs Confirm the expected format, and what happens if not provided. --- website/source/docs/agent/options.html.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/source/docs/agent/options.html.markdown b/website/source/docs/agent/options.html.markdown index ac579974d..d84c2cc90 100644 --- a/website/source/docs/agent/options.html.markdown +++ b/website/source/docs/agent/options.html.markdown @@ -285,7 +285,9 @@ definitions support being updated during a reload. Note that the `acl_master_token` is only installed when a server acquires cluster leadership. If you would like to install or change the `acl_master_token`, set the new value for `acl_master_token` in the configuration for all servers. Once this is done, restart the current leader to force a - leader election. + leader election. If the acl_master_token is not supplied, then the servers do not create a master + token. When you provide a value, it can be any string value. Using a UUID would ensure that it looks + the same as the other tokens, but isn't strictly necessary. * `acl_token` - When provided, the agent will use this token when making requests to the Consul servers. Clients can override this token on a per-request