From: Sage Weil <sage@inktank.com>
Date: Wed, 12 Jun 2013 21:53:56 +0000 (-0700)
Subject: ceph: accept osd.* as a valid name
X-Git-Tag: v0.65~85^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=edba9863141f35f6ea2b4d1a45ace691e0e76346;p=ceph.git

ceph: accept osd.* as a valid name

This will be used for 'ceph tell osd.* ...'

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

diff --git a/src/ceph.in b/src/ceph.in
index 18e518669dc3..4e899ce0f75a 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -365,10 +365,11 @@ class CephName(CephArgtype):
             if not t in ('osd', 'mon', 'client', 'mds'):
                 raise ArgumentValid('unknown type ' + self.t)
             if t == 'osd':
-                try:
-                    i = int(i)
-                except:
-                    raise ArgumentFormat('osd id ' + i + ' not integer')
+                if i != '*':
+                    try:
+                        i = int(i)
+                    except:
+                        raise ArgumentFormat('osd id ' + i + ' not integer')
             self.nametype = t
         self.val = s
         self.nameid = i