Reporting: Merge new reporting data

Move reporting data to a new schema
Use south for django migrations
Add bcfg2-report-collector daemon

Conflicts:
	doc/development/index.txt
	doc/server/plugins/connectors/properties.txt
	doc/server/plugins/generators/packages.txt
	setup.py
	src/lib/Bcfg2/Client/Tools/SELinux.py
	src/lib/Bcfg2/Compat.py
	src/lib/Bcfg2/Encryption.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Reports.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/FileMonitor/Inotify.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/interfaces.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
	src/lib/Bcfg2/Server/Plugins/FileProbes.py
	src/lib/Bcfg2/Server/Plugins/Ohai.py
	src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
	src/lib/Bcfg2/Server/Plugins/Packages/Source.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/Server/Plugins/Properties.py
	src/lib/Bcfg2/Server/Reports/backends.py
	src/lib/Bcfg2/Server/Reports/manage.py
	src/lib/Bcfg2/Server/Reports/nisauth.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-yum-helper
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestSEModules.py

1 files changed, 10 insertions, 17 deletions

diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 14b9d9d0a..ae1c578fa 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -148,25 +148,18 @@ class BaseCore(object):
         Bcfg2.settings.read_config(repo=self.datastore)
 
         self._database_available = False
-        # verify our database schema
-        try:
-            from Bcfg2.Server.SchemaUpdater import update_database, \
-                UpdaterError
+        if Bcfg2.settings.HAS_DJANGO:
+            from django.core.exceptions import ImproperlyConfigured
+            from django.core import management
             try:
-                update_database()
+                management.call_command("syncdb", interactive=False, verbosity=0)
                 self._database_available = True
-            except UpdaterError:
-                err = sys.exc_info()[1]
-                self.logger.error("Failed to update database schema: %s" % err)
-        except ImportError:
-            # assume django is not installed
-            pass
-        except Exception:
-            inst = sys.exc_info()[1]
-            self.logger.error("Failed to update database schema")
-            self.logger.error(str(inst))
-            self.logger.error(str(type(inst)))
-            raise CoreInitError
+            except ImproperlyConfigured:
+                self.logger.error("Django configuration problem: %s" % 
+                    format_exc().splitlines()[-1])
+            except:
+                self.logger.error("Database update failed: %s" % 
+                    format_exc().splitlines()[-1])
 
         if '' in setup['plugins']:
             setup['plugins'].remove('')