docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2904 from patrikerdes/2903_swarm_replication 

Fix #2903, revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method
This commit is contained in:
Nathan LeClaire 2016-01-22 14:52:26 -08:00
parent 72d9c4d039 92b9853478
commit 432eece6ff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmachine/provision/configure_swarm.go
View File

@ -42,7 +42,7 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
if swarmOptions.Master { if swarmOptions.Master {
advertiseMasterInfo := fmt.Sprintf("%s:%s", ip, "3376") 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.CaCertRemotePath,
authOptions.ServerCertRemotePath, authOptions.ServerCertRemotePath,
authOptions.ServerKeyRemotePath, authOptions.ServerKeyRemotePath,