diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-21 08:03:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-21 08:03:40 +0000 |
| commit | 7a402c58588f813c3f7b1a7dc9642c021eb9045b (patch) | |
| tree | 19107d6535a99b7fa7aae420c3df54fbe61f882c /ironic/cmd | |
| parent | 62e7a9ea51b6dd01e3f84a1f85f51c375ed3f73e (diff) | |
| parent | dcc049768bc30c093637705a81acae5eefbde833 (diff) | |
| download | ironic-7a402c58588f813c3f7b1a7dc9642c021eb9045b.tar.gz | |
Merge "Fixes unusable Guru meditation report"
Diffstat (limited to 'ironic/cmd')
| -rw-r--r-- | ironic/cmd/api.py | 2 | ||||
| -rw-r--r-- | ironic/cmd/conductor.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ironic/cmd/api.py b/ironic/cmd/api.py index 1e8dbcdf6..38ec7bd1f 100644 --- a/ironic/cmd/api.py +++ b/ironic/cmd/api.py @@ -23,6 +23,7 @@ from oslo_config import cfg from oslo_log import log try: from oslo_reports import guru_meditation_report as gmr + from oslo_reports import opts as gmr_opts except ImportError: gmr = None @@ -41,6 +42,7 @@ def main(): ironic_service.prepare_service(sys.argv) if gmr is not None: + gmr_opts.set_defaults(CONF) gmr.TextGuruMeditation.setup_autorun(version) else: LOG.debug('Guru meditation reporting is disabled ' diff --git a/ironic/cmd/conductor.py b/ironic/cmd/conductor.py index c9c56a2fd..4164db18a 100644 --- a/ironic/cmd/conductor.py +++ b/ironic/cmd/conductor.py @@ -25,6 +25,7 @@ from oslo_config import cfg from oslo_log import log try: from oslo_reports import guru_meditation_report as gmr + from oslo_reports import opts as gmr_opts except ImportError: gmr = None from oslo_service import service @@ -78,7 +79,8 @@ def main(): ironic_service.prepare_service(sys.argv) if gmr is not None: - gmr.TextGuruMeditation.setup_autorun(version) + gmr_opts.set_defaults(CONF) + gmr.TextGuruMeditation.setup_autorun(version, conf=CONF) else: LOG.debug('Guru meditation reporting is disabled ' 'because oslo.reports is not installed') |