1 files changed, 25 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index c294e6be5..b038980a1 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -25,15 +25,19 @@ import Bcfg2.Server.Plugins.Metadata
 try:
     from django.core.exceptions import ImproperlyConfigured
     from django.core import management
+    import django
     import django.conf
     import Bcfg2.Server.models
 
     HAS_DJANGO = True
-    try:
-        import south  # pylint: disable=W0611
+    if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
         HAS_REPORTS = True
-    except ImportError:
-        HAS_REPORTS = False
+    else:
+        try:
+            import south  # pylint: disable=W0611
+            HAS_REPORTS = True
+        except ImportError:
+            HAS_REPORTS = False
 except ImportError:
     HAS_DJANGO = False
     HAS_REPORTS = False
@@ -877,6 +881,7 @@ if HAS_DJANGO:
         Django management system """
         command = None
         args = []
+        kwargs = {}
 
         def run(self, _):
             '''Call a django command'''
@@ -885,7 +890,7 @@ if HAS_DJANGO:
             else:
                 command = self.__class__.__name__.lower()
             args = [command] + self.args
-            management.call_command(*args)
+            management.call_command(*args, **self.kwargs)
 
     class DBShell(_DjangoProxyCmd):
         """ Call the Django 'dbshell' command on the database """
@@ -901,7 +906,6 @@ if HAS_DJANGO:
         """ Sync the Django ORM with the configured database """
 
         def run(self, setup):
-            Bcfg2.Server.models.load_models()
             try:
                 Bcfg2.DBSettings.sync_databases(
                     interactive=False,
@@ -915,6 +919,17 @@ if HAS_DJANGO:
                 self.logger.error("Database update failed: %s" % err)
                 raise SystemExit(1)
 
+    if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
+        class Makemigrations(_DjangoProxyCmd):
+            """ Call the 'makemigrations' command on the database """
+            args = ['Reporting']
+
+    else:
+        class Schemamigration(_DjangoProxyCmd):
+            """ Call the South 'schemamigration' command on the database """
+            args = ['Bcfg2.Reporting']
+            kwargs = {'auto': True}
+
 
 if HAS_REPORTS:
     import datetime
@@ -1194,6 +1209,10 @@ class CLI(Bcfg2.Options.CommandRegistry):
             components=[self])
         parser.add_options(self.subcommand_options)
         parser.parse()
+        if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
+            # this has been introduced in django 1.7, so pylint fails with
+            # older django releases
+            django.setup()  # pylint: disable=E1101
 
     def run(self):
         """ Run bcfg2-admin """