Merge "Support file watcher to trigger GMR report"

etc/magnum/magnum-config-generator.conf

@@ -9,6 +9,7 @@ namespace = oslo.log
 namespace = oslo.messaging
 namespace = oslo.middleware.cors
 namespace = oslo.policy
+namespace = oslo.reports
 namespace = oslo.service.periodic_task
 namespace = oslo.service.service
 namespace = oslo.versionedobjects

magnum/cmd/api.py

@@ -20,6 +20,7 @@ import sys
 from oslo_concurrency import processutils
 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 werkzeug import serving
 
 from magnum.api import app as api_app
@@ -56,7 +57,8 @@ def _get_ssl_configs(use_ssl):
 def main():
     service.prepare_service(sys.argv)
 
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     # Enable object backporting via the conductor
     base.MagnumObject.indirection_api = base.MagnumObjectIndirectionAPI()

magnum/cmd/conductor.py

@@ -20,6 +20,7 @@ import sys
 from oslo_concurrency import processutils
 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 oslo_service import service
 
 from magnum.common import rpc_service
@@ -41,7 +42,8 @@ LOG = logging.getLogger(__name__)
 def main():
     magnum_service.prepare_service(sys.argv)
 
-    gmr.TextGuruMeditation.setup_autorun(version)
+    gmr_opts.set_defaults(CONF)
+    gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
 
     LOG.info('Starting server in PID %s', os.getpid())
     LOG.debug("Configuration:")