summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Metadata.py
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2016-08-17 15:12:32 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2016-08-17 21:00:04 +0200
commit064f22356f712afd4e7252651fe4a933dc4659aa (patch)
tree3c19ec987b38f5dc272d0df82293c24afd5be097 /src/lib/Bcfg2/Server/Plugins/Metadata.py
parentbde0302f2e2e24c4cf57f72e470bf04f859fd79c (diff)
downloadbcfg2-064f22356f712afd4e7252651fe4a933dc4659aa.tar.gz
bcfg2-064f22356f712afd4e7252651fe4a933dc4659aa.tar.bz2
bcfg2-064f22356f712afd4e7252651fe4a933dc4659aa.zip
Server/Plugins/Metadata: Initialize django _before_ creating models
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Metadata.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Metadata.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 30f60fffe..40504e15e 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -42,6 +42,9 @@ def load_django_models():
HAS_DJANGO = False
return
+ if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
+ django.setup() # pylint: disable=E1101
+
class MetadataClientModel(models.Model, # pylint: disable=W0621
Bcfg2.Server.Plugin.PluginDatabaseModel):
""" django model for storing clients in the database """
@@ -100,9 +103,6 @@ def load_django_models():
except MetadataClientModel.DoesNotExist:
return False
- if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
- django.setup() # pylint: disable=E1101
-
class XMLMetadataConfig(Bcfg2.Server.Plugin.XMLFileBacked):
"""Handles xml config files and all XInclude statements"""