1 files changed, 4 insertions, 10 deletions
diff --git a/src/sbin/bcfg2-report-collector b/src/sbin/bcfg2-report-collector
index ae6d3b167..00e015100 100755
--- a/src/sbin/bcfg2-report-collector
+++ b/src/sbin/bcfg2-report-collector
@@ -11,20 +11,14 @@ from Bcfg2.Reporting.Collector import ReportingCollector, ReportingError
 
 
 def main():
+    parser = Bcfg2.Options.get_parser(description="Collect Bcfg2 report data",
+                                      components=[ReportingCollector])
+    parser.parse()
     logger = logging.getLogger('bcfg2-report-collector')
-    optinfo = dict(daemon=Bcfg2.Options.DAEMON,
-                   repo=Bcfg2.Options.SERVER_REPOSITORY,
-                   filemonitor=Bcfg2.Options.SERVER_FILEMONITOR,
-                   web_configfile=Bcfg2.Options.WEB_CFILE)
-    optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
-    optinfo.update(Bcfg2.Options.REPORTING_COMMON_OPTIONS)
-    setup = Bcfg2.Options.load_option_parser(optinfo)
-    setup.parse()
 
     # run collector
     try:
-        collector = ReportingCollector(setup)
-        collector.run()
+        ReportingCollector().run()
     except ReportingError:
         msg = sys.exc_info()[1]
         logger.error(msg)