ceph: always populate `targets` with ids_by_service()

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/ceph.in b/src/ceph.in
index adb11c39b2aee45f77c10f6cabe17c94585677b6..4843fec9e0b5e576a79eb5e3d74b50f48163af42 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -1021,13 +1021,11 @@ def main():
     # of the form 'cmdNNN' followed by an array of argument descriptors)
     # as part of the validated argument JSON object
 
-    targets = [target]
-
     if target[1] == '*':
-        if target[0] == 'osd':
-            targets = [(target[0], o) for o in osdids()]
-        elif target[0] == 'mon':
-            targets = [(target[0], m) for m in monids()]
+        service = target[0]
+        targets = [(service, o) for o in ids_by_service(service)]
+    else:
+        targets = [target]
 
     final_ret = 0
     for target in targets: