From b2d574117e9eb5ca176e1eb8c204c5d96a710ac7 Mon Sep 17 00:00:00 2001 From: Chris Aubuchon Date: Wed, 2 Dec 2015 15:56:00 -0600 Subject: [PATCH] Fix links to configuration options --- website/source/docs/agent/config.html.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website/source/docs/agent/config.html.md b/website/source/docs/agent/config.html.md index 3cb98c0e8..cba8b76a1 100644 --- a/website/source/docs/agent/config.html.md +++ b/website/source/docs/agent/config.html.md @@ -177,19 +177,19 @@ configured on client nodes. "1.5h" or "25m". Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". Controls how long a node must be in a terminal state before it is garbage collected and purged from the system. - * `rejoin_after_leave` When provided, Nomad will ignore a previous leave and + * `rejoin_after_leave` When provided, Nomad will ignore a previous leave and attempt to rejoin the cluster when starting. By default, Nomad treats leave as a permanent intent and does not attempt to join the cluster again when starting. This flag allows the previous state to be used to rejoin the cluster. - * `retry_join` Similar to [`start_join`](#_start_join) but allows retrying a join + * `retry_join` Similar to [`start_join`](#_start_join) but allows retrying a join if the first attempt fails. This is useful for cases where we know the address will become available eventually. - * `retry_interval` The time to wait between join attempts. Defaults to 30s. - * `retry_max` The maximum number of join attempts to be made before exiting + * `retry_interval` The time to wait between join attempts. Defaults to 30s. + * `retry_max` The maximum number of join attempts to be made before exiting with a return code of 1. By default, this is set to 0 which is interpreted as infinite retries. - * `start_join` An array of strings specifying addresses of nodes to join upon startup. + * `start_join` An array of strings specifying addresses of nodes to join upon startup. If Nomad is unable to join with any of the specified addresses, agent startup will fail. By default, the agent won't join any nodes when it starts up.