From e8eb144e24bdf0ef0613b58abc617737fa8e55d4 Mon Sep 17 00:00:00 2001 From: Troy Fontaine Date: Tue, 15 Mar 2016 23:24:46 -0500 Subject: [PATCH 1/3] Added node discovery warning Signed-off-by: Troy Fontaine --- docs/discovery.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/discovery.md b/docs/discovery.md index 6d20dea544..a99364592d 100644 --- a/docs/discovery.md +++ b/docs/discovery.md @@ -101,6 +101,8 @@ This works the same way for the Swarm `manage` and `list` commands. ## A static file or list of nodes +> ***Warning*** This discovery method is not compatible with replicating swarm masters, so if you require replication, you will need to use a hosted discovery key store. + You can use a static file or list of nodes for your discovery backend. The file must be stored on a host that is accessible from the Swarm manager. You can also pass a node list as an option when you start Swarm. Both the static file and the `nodes` option support a IP address ranges. To specify a range supply a pattern, for example, `10.0.0.[10:200]` refers to nodes starting from `10.0.0.10` to `10.0.0.200`. For example for the `file` discovery method. From ec7db8551eb2e66a305a17f38832463ea1074571 Mon Sep 17 00:00:00 2001 From: Troy Fontaine Date: Thu, 24 Mar 2016 22:27:46 -0500 Subject: [PATCH 2/3] Added suggested modifications Signed-off-by: Troy Fontaine --- docs/discovery.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/discovery.md b/docs/discovery.md index a99364592d..7389bcb1b5 100644 --- a/docs/discovery.md +++ b/docs/discovery.md @@ -101,7 +101,7 @@ This works the same way for the Swarm `manage` and `list` commands. ## A static file or list of nodes -> ***Warning*** This discovery method is not compatible with replicating swarm masters, so if you require replication, you will need to use a hosted discovery key store. +> ***Warning*** This discovery method is inompatible with replicating swarm masters. If you require replication, you should use a hosted discovery key store. You can use a static file or list of nodes for your discovery backend. The file must be stored on a host that is accessible from the Swarm manager. You can also pass a node list as an option when you start Swarm. From 24fdd1260213348c6d5b0a45eb06dc858e9711b9 Mon Sep 17 00:00:00 2001 From: Troy Fontaine Date: Fri, 25 Mar 2016 12:32:54 -0500 Subject: [PATCH 3/3] Correctly added note as requested Signed-off-by: Troy Fontaine --- docs/discovery.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/discovery.md b/docs/discovery.md index 7389bcb1b5..22b88878c2 100644 --- a/docs/discovery.md +++ b/docs/discovery.md @@ -101,7 +101,9 @@ This works the same way for the Swarm `manage` and `list` commands. ## A static file or list of nodes -> ***Warning*** This discovery method is inompatible with replicating swarm masters. If you require replication, you should use a hosted discovery key store. +> **Note***: This discovery method is incompatible with replicating Swarm +managers. If you require replication, you should use a hosted discovery key +store. You can use a static file or list of nodes for your discovery backend. The file must be stored on a host that is accessible from the Swarm manager. You can also pass a node list as an option when you start Swarm.