From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 30 Aug 2017 22:28:11 +0000 (-0700)
Subject: ceph.in: validate service glob
X-Git-Tag: v12.2.2~77^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=460268b5e9c9a77aae134049aa320977f02fc911;p=ceph.git

ceph.in: validate service glob

Fixes: http://tracker.ceph.com/issues/21191

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 59bee1e7274934cebe0dcefd9fcedb6886a5e2d0)
---

diff --git a/src/ceph.in b/src/ceph.in
index cb1bd869419..c14c477e801 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -228,7 +228,7 @@ def validate_target(target):
                   file=sys.stderr)
             return False
 
-        if service_id in exist_ids:
+        if service_id in exist_ids or len(exist_ids) > 0 and service_id == '*':
             return True
         else:
             print('WARN: the service id you provided does not exist. service id should '