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

Merge pull request #3387 from ndeloof/fix-3287 

Introduce —swarm-join-opt to pass options to agent nodes Fixes #3285 Fix regression introduced by PR #3287
This commit is contained in:
Nathan LeClaire 2016-04-28 10:54:12 -07:00
parent 445158a731 ab1ca913ad
commit 25c3fa64a4
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
commands/create.go
View File

@ -105,7 +105,12 @@ var (
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "swarm-opt", Name: "swarm-opt",
Usage: "Define arbitrary flags for swarm", Usage: "Define arbitrary flags for Swarm master",
Value: &cli.StringSlice{},
},
cli.StringSliceFlag{
Name: "swarm-join-opt",
Usage: "Define arbitrary flags for Swarm join",
Value: &cli.StringSlice{}, Value: &cli.StringSlice{},
}, },
cli.StringFlag{ cli.StringFlag{
@ -188,15 +193,16 @@ func cmdCreateInner(c CommandLine, api libmachine.API) error {
InstallURL: c.String("engine-install-url"), InstallURL: c.String("engine-install-url"),
}, },
SwarmOptions: &swarm.Options{ SwarmOptions: &swarm.Options{
IsSwarm: c.Bool("swarm"), IsSwarm: c.Bool("swarm"),
Image: c.String("swarm-image"), Image: c.String("swarm-image"),
Master: c.Bool("swarm-master"), Master: c.Bool("swarm-master"),
Discovery: c.String("swarm-discovery"), Discovery: c.String("swarm-discovery"),
Address: c.String("swarm-addr"), Address: c.String("swarm-addr"),
Host: c.String("swarm-host"), Host: c.String("swarm-host"),
Strategy: c.String("swarm-strategy"), Strategy: c.String("swarm-strategy"),
ArbitraryFlags: c.StringSlice("swarm-opt"), ArbitraryFlags: c.StringSlice("swarm-opt"),
IsExperimental: c.Bool("swarm-experimental"), ArbitraryJoinFlags: c.StringSlice("swarm-join-opt"),
IsExperimental: c.Bool("swarm-experimental"),
}, },
} }

2
libmachine/provision/configure_swarm.go
View File

@ -124,7 +124,7 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
"--advertise", "--advertise",
advertiseInfo, advertiseInfo,
} }
for _, option := range swarmOptions.ArbitraryFlags { for _, option := range swarmOptions.ArbitraryJoinFlags {
cmdWorker = append(cmdWorker, "--"+option) cmdWorker = append(cmdWorker, "--"+option)
} }
cmdWorker = append(cmdWorker, swarmOptions.Discovery) cmdWorker = append(cmdWorker, swarmOptions.Discovery)

25
libmachine/swarm/swarm.go
View File

@ -5,16 +5,17 @@ const (
) )
type Options struct { type Options struct {
IsSwarm bool IsSwarm bool
Address string Address string
Discovery string Discovery string
Master bool Master bool
Host string Host string
Image string Image string
Strategy string Strategy string
Heartbeat int Heartbeat int
Overcommit float64 Overcommit float64
ArbitraryFlags []string ArbitraryFlags []string
Env []string ArbitraryJoinFlags []string
IsExperimental bool Env []string
IsExperimental bool
} }