Refactor common configuration bits from service commands

The prepare_service call from ironic.common.service is changed to also
configure guru meditation and profiler. A new call prepare_command is
provided for the cases it's not required.

Change-Id: I5b9b7b7bc827c8bcda06e9a967deae8577ad87f4

3 files changed, 3 insertions, 35 deletions

diff --git a/ironic/cmd/api.py b/ironic/cmd/api.py
index 38ec7bd1f..4a4b381c8 100644
--- a/ironic/cmd/api.py
+++ b/ironic/cmd/api.py
@@ -21,16 +21,9 @@ import sys
 
 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 ironic.common import profiler
 from ironic.common import service as ironic_service
 from ironic.common import wsgi_service
-from ironic import version
 
 CONF = cfg.CONF
 
@@ -39,16 +32,7 @@ LOG = log.getLogger(__name__)
 
 def main():
     # Parse config file and command line options, then start logging
-    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 '
-                  'because oslo.reports is not installed')
-
-    profiler.setup('ironic_api', CONF.host)
+    ironic_service.prepare_service('ironic_api', sys.argv)
 
     # Build and start the WSGI app
     launcher = ironic_service.process_launcher()
diff --git a/ironic/cmd/conductor.py b/ironic/cmd/conductor.py
index d2ee20f5f..19fb05cb4 100644
--- a/ironic/cmd/conductor.py
+++ b/ironic/cmd/conductor.py
@@ -23,17 +23,10 @@ import sys
 
 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
 
-from ironic.common import profiler
 from ironic.common import rpc_service
 from ironic.common import service as ironic_service
-from ironic import version
 
 CONF = cfg.CONF
 
@@ -64,14 +57,7 @@ def main():
     assert 'ironic.conductor.manager' not in sys.modules
 
     # Parse config file and command line options, then start logging
-    ironic_service.prepare_service(sys.argv)
-
-    if gmr is not None:
-        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')
+    ironic_service.prepare_service('ironic_conductor', sys.argv)
 
     mgr = rpc_service.RPCService(CONF.host,
                                  'ironic.conductor.manager',
@@ -79,8 +65,6 @@ def main():
 
     issue_startup_warnings(CONF)
 
-    profiler.setup('ironic_conductor', CONF.host)
-
     launcher = service.launch(CONF, mgr, restart_method='mutate')
     launcher.wait()
 
diff --git a/ironic/cmd/dbsync.py b/ironic/cmd/dbsync.py
index 484e8096c..9cdfa2f4f 100644
--- a/ironic/cmd/dbsync.py
+++ b/ironic/cmd/dbsync.py
@@ -338,5 +338,5 @@ def main():
     if not set(sys.argv) & valid_commands:
         sys.argv.append('upgrade')
 
-    service.prepare_service(sys.argv)
+    service.prepare_command(sys.argv)
     CONF.command.func()