Explicitly deprecate --engine-refresh-retry.

Signed-off-by: Dong Chen <dongluo.chen@docker.com>

cli/commands.go

@@ -26,7 +26,7 @@ var (
 				flHosts,
 				flLeaderElection, flLeaderTTL, flManageAdvertise,
 				flTLS, flTLSCaCert, flTLSCert, flTLSKey, flTLSVerify,
-				flRefreshIntervalMin, flRefreshIntervalMax, flFailureRetry,
+				flRefreshIntervalMin, flRefreshIntervalMax, flFailureRetry, flRefreshRetry,
 				flHeartBeat,
 				flEnableCors,
 				flCluster, flDiscoveryOpt, flClusterOpt},

cli/flags.go

@@ -71,6 +71,11 @@ var (
 		Value: "60s",
 		Usage: "set engine refresh maximum interval",
 	}
+	flRefreshRetry = cli.IntFlag{
+		Name:  "engine-refresh-retry",
+		Value: 3,
+		Usage: "deprecated; replaced by --engine-failure-retry",
+	}
 	flFailureRetry = cli.IntFlag{
 		Name:  "engine-failure-retry",
 		Value: 3,

cli/manage.go

@@ -240,6 +240,11 @@ func manage(c *cli.Context) {
 	if refreshMaxInterval < refreshMinInterval {
 		log.Fatal("max refresh interval cannot be less than min refresh interval")
 	}
+	// engine-refresh-retry is deprecated
+	refreshRetry := c.Int("engine-refresh-retry")
+	if refreshRetry != 3 {
+		log.Fatal("--engine-refresh-retry is deprecated. Use --engine-failure-retry")
+	}
 	failureRetry := c.Int("engine-failure-retry")
 	if failureRetry <= 0 {
 		log.Fatal("invalid failure retry count")