]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mon/ConfigMap: push kv parsing logic into add_option()
authorSage Weil <sage@newdream.net>
Tue, 16 Nov 2021 22:48:27 +0000 (17:48 -0500)
committerMatan Breizman <mbreizma@redhat.com>
Mon, 16 Oct 2023 12:27:00 +0000 (12:27 +0000)
commit4b1e82eaaa602dfa3e21b5adc0e9a7ae24359974
tree3f3e061fb30a96482af419d17b1309be1788f342
parente65f676cd17836b2144fca82408412fe9e21fdaf
mon/ConfigMap: push kv parsing logic into add_option()

Push shared code into ConfigMap from mon + mgr.  Pass in a function to
fetch the Option*, since in the mon case it may come from somewhere other
than g_conf.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d8ccd221549cdd28702932deb148f075cb6d88b3)

Fixed conflict: `mopt.localized_name = name;` is added to add_option()
(due to 3821722e5660437298a7c0f41e1061d363090103)
src/mgr/ActivePyModules.cc
src/mon/ConfigMap.cc
src/mon/ConfigMap.h
src/mon/ConfigMonitor.cc