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

Merge pull request #857 from vieux/mesos_experimental 

add warning and rename flag
This commit is contained in:
Victor Vieux 2015-05-26 17:17:30 -07:00
parent 67122a68e5 9ff9bd16ae
commit 4f06657814
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/flags.go
View File

@ -106,7 +106,7 @@ var (
flCluster = cli.StringFlag{
Name: "cluster-driver, c",
Usage: "cluster driver to use [swarm, mesos]",
Usage: "cluster driver to use [swarm, mesos-experimental]",
Value: "swarm",
}
flClusterOpt = cli.StringSliceFlag{

5
cli/manage.go
View File

@ -189,12 +189,13 @@ func manage(c *cli.Context) {
sched := scheduler.New(s, fs)
var cl cluster.Cluster
switch c.String("cluster-driver") {
case "mesos":
case "mesos-experimental":
log.Warn("WARNING: the mesos driver is currently experimental, use at you own risks")
cl, err = mesos.NewCluster(sched, store, tlsConfig, uri, c.StringSlice("cluster-opt"))
case "swarm":
cl, err = swarm.NewCluster(sched, store, tlsConfig, discovery, c.StringSlice("cluster-opt"))
default:
log.Fatalf("Unsupported cluster %q", c.String("cluster-driver"))
log.Fatalf("unsupported cluster %q", c.String("cluster-driver"))
}
if err != nil {
log.Fatal(err)