Merge branch 'options-rewrite'

Conflicts:
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/SSLServer.py
	src/lib/Bcfg2/Utils.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-test
	src/sbin/bcfg2-yum-helper
	tools/bcfg2-profile-templates.py

1 files changed, 6 insertions, 14 deletions

diff --git a/tools/upgrade/1.3/migrate_dbstats.py b/tools/upgrade/1.3/migrate_dbstats.py
index 07def2ac8..f52ccab08 100755
--- a/tools/upgrade/1.3/migrate_dbstats.py
+++ b/tools/upgrade/1.3/migrate_dbstats.py
@@ -9,10 +9,9 @@ import logging
 import time
 import Bcfg2.Logger
 import Bcfg2.Options
-from django.core.cache import cache
 from django.db import connection, transaction, backend
 
-from Bcfg2.Server.Admin.Reports import Reports
+from Bcfg2.Server.Admin import UpdateReports
 from Bcfg2.Reporting import models as new_models
 from Bcfg2.Reporting.utils import BatchFetch
 from Bcfg2.Server.Reports.reports import models as legacy_models
@@ -281,17 +280,10 @@ def _restructure():
 
 
 if __name__ == '__main__':
-    Bcfg2.Logger.setup_logging('bcfg2-report-collector',
-                                   to_console=logging.INFO,
-                                   level=logging.INFO)
-
-    optinfo = dict()
-    optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
-    optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
-    setup = Bcfg2.Options.OptionParser(optinfo)
-    setup.parse(sys.argv[1:])
-
-    #sync!
-    Reports(setup).__call__(['update'])
+    parser = Bcfg2.Options.get_parser(
+        description="Migrate from Bcfg2 1.2 DBStats plugin to 1.3 Reporting "
+        "subsystem",
+        components=[UpdateReports])
 
+    UpdateReports().run(Bcfg2.Options.setup)
     _restructure()