]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/mgr_module: add default arg to get_config
authorSage Weil <sage@redhat.com>
Tue, 11 Jul 2017 20:26:16 +0000 (16:26 -0400)
committerJohn Spray <john.spray@redhat.com>
Wed, 1 Nov 2017 23:03:22 +0000 (23:03 +0000)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 39c42ddb9339c1950a3a474e8083db8b24e775a6)

src/pybind/mgr/mgr_module.py

index 57ea33e16601b90eceae9dbd16e41f325aa9c5bb..0236e92d76c7b4c2b25e7ed75c6becf236e08f23 100644 (file)
@@ -260,14 +260,18 @@ class MgrModule(object):
         """
         return ceph_state.get_mgr_id()
 
-    def get_config(self, key):
+    def get_config(self, key, default=None):
         """
         Retrieve the value of a persistent configuration setting
 
         :param key: str
         :return: str
         """
-        return ceph_state.get_config(self._handle, key)
+        r = ceph_state.get_config(self._handle, key)
+        if r is None:
+            return default
+        else:
+            return r
 
     def get_config_prefix(self, key_prefix):
         """