disable cluster flag

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Victor Vieux 2015-04-03 16:23:56 -07:00
parent 8f50c0eb7a
commit 805b4763f4
4 changed files with 10 additions and 7 deletions

View File

@ -98,9 +98,10 @@ var (
Usage: "filter to use [" + strings.Join(filter.List(), ", ") + "]", Usage: "filter to use [" + strings.Join(filter.List(), ", ") + "]",
Value: &flFilterValue, Value: &flFilterValue,
} }
flCluster = cli.StringFlag{
Name: "cluster, c", // flCluster = cli.StringFlag{
Usage: "cluster to use [swarm, mesos]", // Name: "cluster, c",
Value: "swarm", // Usage: "cluster to use [swarm, mesos]",
} // Value: "swarm",
// }
) )

View File

@ -105,7 +105,7 @@ func main() {
ShortName: "m", ShortName: "m",
Usage: "manage a docker cluster", Usage: "manage a docker cluster",
Flags: []cli.Flag{ Flags: []cli.Flag{
flStore, flCluster, flStore,
flStrategy, flFilter, flStrategy, flFilter,
flHosts, flHeartBeat, flOverCommit, flHosts, flHeartBeat, flOverCommit,
flTLS, flTLSCaCert, flTLSCert, flTLSKey, flTLSVerify, flTLS, flTLSCaCert, flTLSCert, flTLSKey, flTLSVerify,

View File

@ -66,6 +66,7 @@ func ApplyFilters(filters []Filter, config *dockerclient.ContainerConfig, nodes
return nodes, nil return nodes, nil
} }
// List returns the names of all the available filters
func List() []string { func List() []string {
names := []string{} names := []string{}

View File

@ -36,7 +36,7 @@ func init() {
// New is exported // New is exported
func New(name string) (PlacementStrategy, error) { func New(name string) (PlacementStrategy, error) {
if name == "binpacking" { //compat if name == "binpacking" { //TODO: remove this compat
name = "binpack" name = "binpack"
} }
@ -51,6 +51,7 @@ func New(name string) (PlacementStrategy, error) {
return nil, ErrNotSupported return nil, ErrNotSupported
} }
// List returns the names of all the available strategies
func List() []string { func List() []string {
names := []string{} names := []string{}