From: Sage Weil <sage@redhat.com>
Date: Sat, 22 Jul 2017 04:00:24 +0000 (-0400)
Subject: ceph: drop --admin-socket warning/error on ceph cli
X-Git-Tag: v12.1.2~126^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e41fb2d978b60b64d4d1a97a11a03160e2d11e5;p=ceph-ci.git

ceph: drop --admin-socket warning/error on ceph cli

'ceph daemon' has existed for a long time; this has outlived its
usefullness.

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

diff --git a/src/ceph.in b/src/ceph.in
index 4112ed178dd..e34c468a7e9 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -276,8 +276,6 @@ def parse_cmdargs(args=None, target=''):
 
     parser.add_argument('--admin-daemon', dest='admin_socket',
                         help='submit admin-socket commands (\"help\" for help')
-    parser.add_argument('--admin-socket', dest='admin_socket_nope',
-                        help='you probably mean --admin-daemon')
 
     parser.add_argument('-s', '--status', action='store_true',
                         help='show cluster status')
@@ -799,11 +797,6 @@ def main():
     if verbose:
         print("parsed_args: {0}, childargs: {1}".format(parsed_args, childargs), file=sys.stderr)
 
-    if parsed_args.admin_socket_nope:
-        print('--admin-socket is used by daemons; '
-              'you probably mean --admin-daemon/daemon', file=sys.stderr)
-        return 1
-
     # pass on --id, --name, --conf
     name = 'client.admin'
     if parsed_args.client_id: