Add 'conf' param for TextGuruMeditation autorun setup

Guru Meditation Report (GMR) supports report generation to file
in a configured directory. By default it will genarate
report to stdout stream. To configure GMR you have to add the
following section to cinder.conf:

[oslo_reports]
log_dir = '/path/to/logs/dir'

DocImpact
Change-Id: Ia32cae8e4fe937f2512693acb7fcc552f01efa01
Closes-Bug: #1546199

diff --git a/cinder/cmd/all.py b/cinder/cmd/all.py
index ceee9c9c8b6868dff623587d8dfa9b16581a882f..705fbff0640348f328640b9c7c1ccd036db77710 100644 (file)
--- a/cinder/cmd/all.py
+++ b/cinder/cmd/all.py
@@ -33,6 +33,7 @@ import sys
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 from cinder import i18n
 i18n.enable_lazy()
@@ -55,6 +56,7 @@ CONF = cfg.CONF
 # TODO(e0ne): get a rid of code duplication in cinder.cmd module in Mitaka
 def main():
     objects.register_all()
+    gmr_opts.set_defaults(CONF)
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
     logging.setup(CONF, "cinder")
@@ -62,7 +64,7 @@ def main():
 
     utils.monkey_patch()
 
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     rpc.init(CONF)
 

diff --git a/cinder/cmd/api.py b/cinder/cmd/api.py
index 9057883c5662d2af98bfe76459622c1bdf6c3305..0115b1f4ea91b4e850299f9bf99a005593628feb 100644 (file)
--- a/cinder/cmd/api.py
+++ b/cinder/cmd/api.py
@@ -27,6 +27,7 @@ from cinder import objects
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 from cinder import i18n
 i18n.enable_lazy()
@@ -44,12 +45,13 @@ CONF = cfg.CONF
 
 def main():
     objects.register_all()
+    gmr_opts.set_defaults(CONF)
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
     logging.setup(CONF, "cinder")
     utils.monkey_patch()
 
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     rpc.init(CONF)
     launcher = service.process_launcher()

diff --git a/cinder/cmd/backup.py b/cinder/cmd/backup.py
index cc265e535faad2c1d86c3c3dee46a8a903a74bb5..1ac0b2b0049d527bdd08d309eda35173ec8de843 100644 (file)
--- a/cinder/cmd/backup.py
+++ b/cinder/cmd/backup.py
@@ -23,6 +23,7 @@ import eventlet
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 eventlet.monkey_patch()
 
@@ -42,11 +43,12 @@ CONF = cfg.CONF
 
 def main():
     objects.register_all()
+    gmr_opts.set_defaults(CONF)
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
     logging.setup(CONF, "cinder")
     utils.monkey_patch()
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
     server = service.Service.create(binary='cinder-backup')
     service.serve(server)
     service.wait()

diff --git a/cinder/cmd/scheduler.py b/cinder/cmd/scheduler.py
index bea47e2b63e53c4da4cdea0c624905e4bf96fa3e..706330f849ea0c0f5691846751f520855c2b0c3d 100644 (file)
--- a/cinder/cmd/scheduler.py
+++ b/cinder/cmd/scheduler.py
@@ -25,6 +25,7 @@ import sys
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 from cinder import i18n
 i18n.enable_lazy()
@@ -42,11 +43,12 @@ CONF = cfg.CONF
 
 def main():
     objects.register_all()
+    gmr_opts.set_defaults(CONF)
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
     logging.setup(CONF, "cinder")
     utils.monkey_patch()
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
     server = service.Service.create(binary='cinder-scheduler')
     service.serve(server)
     service.wait()

diff --git a/cinder/cmd/volume.py b/cinder/cmd/volume.py
index c9877aefeddf2dd4deb73ea2741449d8130fe4f4..31013e7d68e6d6451ba7bfce53d7ca65178cbdd9 100644 (file)
--- a/cinder/cmd/volume.py
+++ b/cinder/cmd/volume.py
@@ -35,6 +35,7 @@ import sys
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_reports import guru_meditation_report as gmr
+from oslo_reports import opts as gmr_opts
 
 from cinder import i18n
 i18n.enable_lazy()
@@ -57,11 +58,12 @@ CONF = cfg.CONF
 
 def main():
     objects.register_all()
+    gmr_opts.set_defaults(CONF)
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
     logging.setup(CONF, "cinder")
     utils.monkey_patch()
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
     launcher = service.get_launcher()
     LOG = logging.getLogger(__name__)
     service_started = False