From ad6fac53db27145fd12f488bbf0552827aa92d80 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Tue, 26 May 2015 17:48:54 -0700 Subject: [PATCH] fix --addr backward compatibility Signed-off-by: Andrea Luzzardi --- cli/flags.go | 4 ++-- cli/join.go | 4 ---- cli/manage.go | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cli/flags.go b/cli/flags.go index 7c0ee0db89..0a7a6fa1e7 100644 --- a/cli/flags.go +++ b/cli/flags.go @@ -33,12 +33,12 @@ var ( Usage: "", } flJoinAdvertise = cli.StringFlag{ - Name: "advertise", + Name: "advertise, addr", Usage: "Address of the Docker Engine joining the cluster. Swarm managers MUST be able to reach Docker at this address.", EnvVar: "SWARM_ADVERTISE", } flManageAdvertise = cli.StringFlag{ - Name: "advertise", + Name: "advertise, addr", Usage: "Address of the Swarm manager joining the cluster. Other swarm managers MUST be able to reach Swarm at this address.", EnvVar: "SWARM_ADVERTISE", } diff --git a/cli/join.go b/cli/join.go index f00291692f..f56f85a076 100644 --- a/cli/join.go +++ b/cli/join.go @@ -21,10 +21,6 @@ func join(c *cli.Context) { } addr := c.String("advertise") - // Backward compatibility. - if addr == "" { - addr = c.String("addr") - } if addr == "" { log.Fatal("missing mandatory --advertise flag") } diff --git a/cli/manage.go b/cli/manage.go index 5b31485ce5..27ae5462ca 100644 --- a/cli/manage.go +++ b/cli/manage.go @@ -211,10 +211,6 @@ func manage(c *cli.Context) { if c.Bool("leader-election") { addr := c.String("advertise") - // Backward compatibility. - if addr == "" { - addr = c.String("addr") - } if addr == "" { log.Fatal("--advertise address must be provided when using --leader-election") }