From 71b5aa7d3b18f6394ffc48e9ceb49adef1be46af Mon Sep 17 00:00:00 2001 From: Yaarit Hatuka Date: Wed, 12 Jan 2022 05:32:01 +0000 Subject: [PATCH] mgr/telemetry: do not restore channels default when opting-out Other modules do not reset their configuration; keep telemetry module consistent with this behavior. Signed-off-by: Yaarit Hatuka --- src/pybind/mgr/telemetry/module.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py index c30a488fee4..446a1bf1be3 100644 --- a/src/pybind/mgr/telemetry/module.py +++ b/src/pybind/mgr/telemetry/module.py @@ -1347,15 +1347,6 @@ class Module(MgrModule): return 0, msg, '' - def restore_default_opt_setting(self, opt_name: str) -> None: - for o in self.MODULE_OPTIONS: - if o['name'] == opt_name: - default_val = o.get('default', None) - self.set_module_option(opt_name, default_val) - setattr(self, - opt_name, - default_val) - @CLIReadCommand('telemetry status') def status(self) -> Tuple[int, str, str]: ''' @@ -1444,10 +1435,7 @@ To enable, add '--license {LICENSE}' to the 'ceph telemetry on' command.''' self.set_store('last_opted_out_ceph_version', str(mon_min)) self.last_opted_out_ceph_version = mon_min - for c in ALL_CHANNELS: - self.restore_default_opt_setting(f"channel_{c}") - - msg = 'Telemetry is now disabled. Channels settings are restored to default.' + msg = 'Telemetry is now disabled.' return 0, msg, '' @CLIReadCommand('telemetry enable channel') -- 2.39.5