fix --addr backward compatibility

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

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",
 	}

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")
 	}

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")
 		}