RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #32755 into master

Browse Source 
* refs/pull/32755/head:
	pybind/mgr/*: fix config_notify handling of default values

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Sage Weil 2020-01-24 14:02:14 -06:00
commit 9033c5e5bf
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/alerts/module.py
View File

@ -106,7 +106,7 @@ class Alerts(MgrModule):
for opt in self.MODULE_OPTIONS:
setattr(self,
opt['name'],
self.get_module_option(opt['name']) or opt['default'])
self.get_module_option(opt['name']))
self.log.debug(' mgr option %s = %s',
opt['name'], getattr(self, opt['name']))
# Do the same for the native options.

2
src/pybind/mgr/cephadm/module.py
View File

@ -678,7 +678,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
for opt in self.MODULE_OPTIONS:
setattr(self,
opt['name'], # type: ignore
self.get_module_option(opt['name']) or opt['default']) # type: ignore
self.get_module_option(opt['name'])) # type: ignore
self.log.debug(' mgr option %s = %s',
opt['name'], getattr(self, opt['name'])) # type: ignore
for opt in self.NATIVE_OPTIONS:

2
src/pybind/mgr/crash/module.py
View File

@ -56,7 +56,7 @@ class Module(MgrModule):
for opt in self.MODULE_OPTIONS:
setattr(self,
opt['name'],
self.get_module_option(opt['name']) or opt['default'])
self.get_module_option(opt['name']))
self.log.debug(' mgr option %s = %s',
opt['name'], getattr(self, opt['name']))

2
src/pybind/mgr/diskprediction_cloud/module.py
View File

@ -142,7 +142,7 @@ class Module(MgrModule):
for opt in self.MODULE_OPTIONS:
setattr(self,
opt['name'],
self.get_module_option(opt['name']) or opt['default'])
self.get_module_option(opt['name']))
self.log.debug(' %s = %s', opt['name'], getattr(self, opt['name']))
if not self._activated_cloud and self.get_ceph_option('device_failure_prediction_mode') == 'cloud':
self._event.set()

2
src/pybind/mgr/diskprediction_local/module.py
View File

@ -54,7 +54,7 @@ class Module(MgrModule):
for opt in self.MODULE_OPTIONS:
setattr(self,
opt['name'],
self.get_module_option(opt['name']) or opt['default'])
self.get_module_option(opt['name']))
self.log.debug(' %s = %s', opt['name'], getattr(self, opt['name']))
if self.get_ceph_option('device_failure_prediction_mode') == 'local':
self._event.set()

2
src/pybind/mgr/hello/module.py
View File

@ -83,7 +83,7 @@ class Hello(MgrModule):
for opt in self.MODULE_OPTIONS:
setattr(self,
opt['name'],
self.get_module_option(opt['name']) or opt['default'])
self.get_module_option(opt['name']))
self.log.debug(' mgr option %s = %s',
opt['name'], getattr(self, opt['name']))
# Do the same for the native options.

2
src/pybind/mgr/k8sevents/module.py
View File

@ -1079,7 +1079,7 @@ class Module(MgrModule):
for opt in self.MODULE_OPTIONS:
setattr(self,
opt['name'],
self.get_module_option(opt['name']) or opt['default'])
self.get_module_option(opt['name']))
if not self.kubernetes_control:
# Populate the config

2
src/pybind/mgr/pg_autoscaler/module.py
View File

@ -97,7 +97,7 @@ class PgAutoscaler(MgrModule):
for opt in self.MODULE_OPTIONS:
setattr(self,
opt['name'],
self.get_module_option(opt['name']) or opt['default'])
self.get_module_option(opt['name']))
self.log.debug(' mgr option %s = %s',
opt['name'], getattr(self, opt['name']))