From: Sage Weil <sage@redhat.com>
Date: Wed, 21 Jun 2017 16:30:07 +0000 (-0400)
Subject: pybind/mgr/restful: remove default path names for the cert
X-Git-Tag: v12.1.0~13^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9ae65e71b9b8e0de67575ef8601fa5f7a407039;p=ceph.git

pybind/mgr/restful: remove default path names for the cert

I don't think these are useful.

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

diff --git a/src/pybind/mgr/restful/module.py b/src/pybind/mgr/restful/module.py
index ee0761fabf81b..c1536530d77b4 100644
--- a/src/pybind/mgr/restful/module.py
+++ b/src/pybind/mgr/restful/module.py
@@ -285,7 +285,7 @@ class Module(MgrModule):
             cert_tmp.flush()
             cert_fname = cert_tmp.name
         else:
-            cert_fname = self.get_localized_config('crt_file') or '/etc/ceph/ceph-mgr-restful.crt'
+            cert_fname = self.get_localized_config('crt_file')
 
         pkey = self.get_localized_config("key")
         if pkey is not None:
@@ -294,7 +294,7 @@ class Module(MgrModule):
             pkey_tmp.flush()
             pkey_fname = pkey_tmp.name
         else:
-            pkey_fname = self.get_localized_config('key_file') or '/etc/ceph/ceph-mgr-restful.key'
+            pkey_fname = self.get_localized_config('key_file')
 
         if not cert_fname or not pkey_fname:
             raise RuntimeError('no certificate configured')