From 06f084a8ec809dd16231134b4489f7c21c288c51 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 5 Jan 2016 18:41:51 -0800 Subject: [PATCH] Before that change, etcd and zookeeper would fail to instantiate the discovery without the key being already there in the store or created beforehand and implicitely by a 'swarm join'. Signed-off-by: Alexandre Beslic Signed-off-by: Victor Vieux This PR allows to configure the discovery path using the --discovery-opt flag (with "kv.path=path/to/nodes"). We can point to "docker/nodes" and use the docker discovery. If docker instances are advertising to the cluster using the `--cluster-advertise` flag, the swarm join command becomes unnecessary. Signed-off-by: Alexandre Beslic Signed-off-by: Victor Vieux --- docs/reference/commandline/daemon.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md index 38ed09bc75..a4606266c9 100644 --- a/docs/reference/commandline/daemon.md +++ b/docs/reference/commandline/daemon.md @@ -603,6 +603,10 @@ The currently supported cluster store options are: private key is used as the client key for communication with the Key/Value store. +* `kv.path` + + Specifies the path in the Key/Value store. If not configured, the default value is 'docker/nodes'. + ## Access authorization Docker's access authorization can be extended by authorization plugins that your