Merge "Fixes unusable Guru meditation report"

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 '

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')

releasenotes/notes/fix-gmr-37332a12065c09dc.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes state report via Guru Meditation Reports that did not work
+    previously because of empty ``log_dir`` and no way to configure
+    this configuration option.

test-requirements.txt

@@ -10,6 +10,7 @@ mock>=3.0.0 # BSD
 Babel!=2.4.0,>=2.3.4 # BSD
 PyMySQL>=0.7.6 # MIT License
 iso8601>=0.1.11 # MIT
+oslo.reports>=1.18.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 psycopg2>=2.7.3 # LGPL/ZPL

tools/config/ironic-config-generator.conf

@@ -17,6 +17,7 @@ namespace = oslo.middleware.http_proxy_to_wsgi
 namespace = oslo.concurrency
 namespace = oslo.policy
 namespace = oslo.log
+namespace = oslo.reports
 namespace = oslo.service.service
 namespace = oslo.service.periodic_task
 namespace = oslo.service.sslutils