From: Sage Weil <sage@redhat.com>
Date: Wed, 18 Mar 2020 20:09:41 +0000 (-0500)
Subject: cephadm: remove outdated check
X-Git-Tag: v15.2.0~17^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0a51c0874135c268c51bc053f3ff7f50c73c0bb;p=ceph.git

cephadm: remove outdated check

Either the user passed their own image or we filled in the (monitoring)
default--no need for this check.

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 8588b0812451b..280e2dc79282f 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2485,8 +2485,6 @@ def command_deploy():
             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