From: Daniel-Pivonka <dpivonka@redhat.com>
Date: Thu, 6 Feb 2020 20:47:26 +0000 (-0500)
Subject: cephadm:Fix name argument parsing during image check for non-ceph components
X-Git-Tag: v15.1.1~522^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=810b96c910b51b3691c535fa29c0f5d41f4f2dd1;p=ceph.git

cephadm:Fix name argument parsing during image check for non-ceph components

bug in parsing introduced in 97def7c
args.name may exist but will be none if flag is not used
check the value in addition to checking if it exists

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 01478d2768502..c6bc9954f1f4c 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2849,7 +2849,7 @@ def _parse_args(av):
     args = parser.parse_args(av)
 
     if not args.image:
-        if 'name' in args:
+        if 'name' in args and args.name:
             type_ = args.name.split('.', 1)[0]
             if type_ in Monitoring.components:
                 args.image = Monitoring.components[type_]['image']