From 92b985347816f9d284101389fa246d9dcb7bc2b6 Mon Sep 17 00:00:00 2001 From: Patrik Erdes Date: Fri, 22 Jan 2016 10:38:10 +0100 Subject: [PATCH] Fix #2903, revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method Signed-off-by: Patrik Erdes --- libmachine/provision/configure_swarm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmachine/provision/configure_swarm.go b/libmachine/provision/configure_swarm.go index 337c3788d4..43ab53ea84 100644 --- a/libmachine/provision/configure_swarm.go +++ b/libmachine/provision/configure_swarm.go @@ -42,7 +42,7 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth. if swarmOptions.Master { advertiseMasterInfo := fmt.Sprintf("%s:%s", ip, "3376") - cmd := fmt.Sprintf("manage --tlsverify --tlscacert=%s --tlscert=%s --tlskey=%s -H %s --strategy %s --replication --advertise %s", + cmd := fmt.Sprintf("manage --tlsverify --tlscacert=%s --tlscert=%s --tlskey=%s -H %s --strategy %s --advertise %s", authOptions.CaCertRemotePath, authOptions.ServerCertRemotePath, authOptions.ServerKeyRemotePath,