Merge pull request #3287 from LBaali/3285

Add support for --swarm-opt to agent nodes
This commit is contained in:
Nathan LeClaire 2016-04-25 12:24:00 -07:00
commit 6839107ecc
1 changed files with 13 additions and 8 deletions

View File

@ -119,15 +119,20 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
},
}
cmdWorker := []string{
"join",
"--advertise",
advertiseInfo,
}
for _, option := range swarmOptions.ArbitraryFlags {
cmdWorker = append(cmdWorker, "--"+option)
}
cmdWorker = append(cmdWorker, swarmOptions.Discovery)
swarmWorkerConfig := &dockerclient.ContainerConfig{
Image: swarmOptions.Image,
Env: swarmOptions.Env,
Cmd: []string{
"join",
"--advertise",
advertiseInfo,
swarmOptions.Discovery,
},
Image: swarmOptions.Image,
Env: swarmOptions.Env,
Cmd: cmdWorker,
HostConfig: workerHostConfig,
}
if swarmOptions.IsExperimental {