cephadm: fix reconfig for monitoring daemons

We shouldn't check for port usage here.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 36a35a7f40a8d6c8f4ac4f894e767f71138e897f..47628f2b83eda8926eaa15a05fb85c644591ca57 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2035,11 +2035,12 @@ def command_deploy():
         monitoring_args = []  # type: List[str]
 
         # Default Checks
-        daemon_ports = Monitoring.port_map[daemon_type]  # type: List[int]
-        if any([port_in_use(port) for port in daemon_ports]):
-            raise Error("TCP Port(s) '{}' required for {} is already in use".format(",".join(map(str, daemon_ports)), daemon_type))
-        elif args.image == DEFAULT_IMAGE:
-            raise Error("--image parameter must be supplied for {}".format(daemon_type))
+        if not args.reconfig:
+            daemon_ports = Monitoring.port_map[daemon_type]  # type: List[int]
+            if any([port_in_use(port) for port in daemon_ports]):
+                raise Error("TCP Port(s) '{}' required for {} is already in use".format(",".join(map(str, daemon_ports)), daemon_type))
+            elif args.image == DEFAULT_IMAGE:
+                raise Error("--image parameter must be supplied for {}".format(daemon_type))
 
         # make sure provided config-json is sufficient
         config = get_parm(args.config_json) # type: ignore