Merge pull request #2853 from nishanttotla/remove-mesos-integration

Remove Mesos integration

Author: nishanttotla

cli/flags.go

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

cli/help.go

@@ -32,7 +32,7 @@ Run '{{.Name}} COMMAND --help' for more information on a command.
 
 {{.Usage}}{{if $DISCOVERY}}
 
-Arguments: 
+Arguments:
    <discovery>    discovery service to use [$SWARM_DISCOVERY]
                    * token://<token>
                    * consul://<ip>/<path>
@@ -45,13 +45,6 @@ Options:
    {{range .Flags}}{{.}}
    {{end}}{{if (eq .Name "manage")}}{{printf "\t * swarm.overcommit=0.05\tovercommit to apply on resources"}}
                                     {{printf "\t * swarm.createretry=0\tcontainer create retry count after initial failure"}}
-                                    {{printf "\t * mesos.address=\taddress to bind on [$SWARM_MESOS_ADDRESS]"}}
-                                    {{printf "\t * mesos.checkpointfailover=false\tcheckpointing allows a restarted slave to reconnect with old executors and recover status updates, at the cost of disk I/O [$SWARM_MESOS_CHECKPOINT_FAILOVER]"}}
-                                    {{printf "\t * mesos.port=\tport to bind on [$SWARM_MESOS_PORT]"}}
-                                    {{printf "\t * mesos.offertimeout=30s\ttimeout for offers [$SWARM_MESOS_OFFER_TIMEOUT]"}}
-                                    {{printf "\t * mesos.offerrefusetimeout=5s\tseconds to consider unused resources refused [$SWARM_MESOS_OFFER_REFUSE_TIMEOUT]"}}
-                                    {{printf "\t * mesos.tasktimeout=5s\ttimeout for task creation [$SWARM_MESOS_TASK_TIMEOUT]"}}
-                                    {{printf "\t * mesos.user=\tframework user [$SWARM_MESOS_USER]"}}{{end}}{{ end }}
 `
 
 }

cli/manage.go

@@ -15,7 +15,6 @@ import (
 	"github.com/docker/leadership"
 	"github.com/docker/swarm/api"
 	"github.com/docker/swarm/cluster"
-	"github.com/docker/swarm/cluster/mesos"
 	"github.com/docker/swarm/cluster/swarm"
 	"github.com/docker/swarm/scheduler"
 	"github.com/docker/swarm/scheduler/filter"
@@ -286,9 +285,6 @@ func manage(c *cli.Context) {
 	sched := scheduler.New(s, fs)
 	var cl cluster.Cluster
 	switch c.String("cluster-driver") {
-	case "mesos-experimental":
-		log.Warn("WARNING: the mesos driver is currently experimental, use at your own risks")
-		cl, err = mesos.NewCluster(sched, tlsConfig, uri, c.StringSlice("cluster-opt"), engineOpts)
 	case "swarm":
 		cl, err = swarm.NewCluster(sched, tlsConfig, discovery, c.StringSlice("cluster-opt"), engineOpts)
 	default: