From: Wido den Hollander <wido@42on.com>
Date: Mon, 26 Jun 2017 09:50:34 +0000 (+0200)
Subject: rest api: Set default ceph.conf and id options
X-Git-Tag: v12.1.2~1^2~25^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00346f68878c6d86170d09e6ab2925dadf4713e1;p=ceph.git

rest api: Set default ceph.conf and id options

This allows for easy execution of the REST API:

  $ /usr/bin/ceph-rest-api

Signed-off-by: Wido den Hollander <wido@42on.com>
---

diff --git a/src/ceph-rest-api b/src/ceph-rest-api
index 1405ab5bbae5..6864028d365a 100755
--- a/src/ceph-rest-api
+++ b/src/ceph-rest-api
@@ -14,10 +14,11 @@ DEVMODEMSG = '*** DEVELOPER MODE: setting PYTHONPATH and LD_LIBRARY_PATH'
 
 def parse_args():
     parser = argparse.ArgumentParser(description="Ceph REST API webapp")
-    parser.add_argument('-c', '--conf', help='Ceph configuration file')
+    parser.add_argument('-c', '--conf', help='Ceph configuration file',
+                        default='/etc/ceph/ceph.conf')
     parser.add_argument('--cluster', help='Ceph cluster name')
     parser.add_argument('-n', '--name', help='Ceph client name')
-    parser.add_argument('-i', '--id', help='Ceph client id')
+    parser.add_argument('-i', '--id', help='Ceph client id', default='admin')
 
     return parser.parse_known_args()