mgr: rename internal ceph_set_config -> ceph_set_module_option

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

diff --git a/src/mgr/BaseMgrModule.cc b/src/mgr/BaseMgrModule.cc
index 2833e27766218b103414767d5441f873a9fb2a68..9aeca666996ea3c01d305ee0ea7572d4d98f3471 100644 (file)
--- a/src/mgr/BaseMgrModule.cc
+++ b/src/mgr/BaseMgrModule.cc
@@ -420,11 +420,11 @@ ceph_store_get_prefix(BaseMgrModule *self, PyObject *args)
 }
 
 static PyObject*
-ceph_config_set(BaseMgrModule *self, PyObject *args)
+ceph_set_module_option(BaseMgrModule *self, PyObject *args)
 {
   char *key = nullptr;
   char *value = nullptr;
-  if (!PyArg_ParseTuple(args, "sz:ceph_config_set", &key, &value)) {
+  if (!PyArg_ParseTuple(args, "sz:ceph_set_module_option", &key, &value)) {
     return nullptr;
   }
   boost::optional<string> val;
@@ -967,8 +967,8 @@ PyMethodDef BaseMgrModule_methods[] = {
   {"_ceph_get_store_prefix", (PyCFunction)ceph_store_get_prefix, METH_VARARGS,
    "Get all KV store values with a given prefix"},
 
-  {"_ceph_set_config", (PyCFunction)ceph_config_set, METH_VARARGS,
-   "Set a configuration value"},
+  {"_ceph_set_module_option", (PyCFunction)ceph_set_module_option, METH_VARARGS,
+   "Set a module configuration option value"},
 
   {"_ceph_get_store", (PyCFunction)ceph_store_get, METH_VARARGS,
    "Get a stored field"},

diff --git a/src/mgr/BaseMgrStandbyModule.cc b/src/mgr/BaseMgrStandbyModule.cc
index 088bb91838d8c67ae44e2c53645d0cfdbff34446..991cbf94ad6c60dbf4a78217d4a02a74f1feda4e 100644 (file)
--- a/src/mgr/BaseMgrStandbyModule.cc
+++ b/src/mgr/BaseMgrStandbyModule.cc
@@ -134,7 +134,7 @@ PyMethodDef BaseMgrStandbyModule_methods[] = {
    "Get the name of the Mgr daemon where we are running"},
 
   {"_ceph_get_module_option", (PyCFunction)ceph_get_module_option, METH_VARARGS,
-   "Get a configuration value"},
+   "Get a module configuration option value"},
 
   {"_ceph_get_store", (PyCFunction)ceph_store_get, METH_VARARGS,
    "Get a KV store value"},

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 7ae94b56b16575ca4a6703c6e2d7cd044c05bb0d..362c085fbd52f967df651089ba2f8f24e0e08b29 100644 (file)
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -736,7 +736,7 @@ class MgrModule(ceph_module.BaseMgrModule):
         return self._get_localized(key, default, self._get_module_option)
 
     def _set_module_option(self, key, val):
-        return self._ceph_set_config(key, val)
+        return self._ceph_set_module_option(key, val)
 
     def set_module_option(self, key, val):
         """