From b682e61ddc190b91da4c6cbaeba3c69d54652afb Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 5 Sep 2017 16:05:44 +0800 Subject: [PATCH] ceph: always populate `targets` with ids_by_service() Signed-off-by: Kefu Chai --- src/ceph.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ceph.in b/src/ceph.in index adb11c39b2aee..4843fec9e0b5e 100755 --- 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: -- 2.39.5