diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-11-17 01:01:26 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-11-17 01:01:26 +0100 |
| commit | 5cac5389b06d74b3820379158f37863f69014826 (patch) | |
| tree | d1b75fa04fbcdf7d277ad80c1eb81d60e9976e90 /src/lib/Bcfg2/Server/Plugins | |
| parent | 0462f31b4243d8cde088f121e519c5db4d6c982f (diff) | |
| download | bcfg2-5cac5389b06d74b3820379158f37863f69014826.tar.gz bcfg2-5cac5389b06d74b3820379158f37863f69014826.tar.bz2 bcfg2-5cac5389b06d74b3820379158f37863f69014826.zip | |
Metadata: Add fix for django1.7
The Metadata database backend also uses django1.7 and we have to run
django.setup() here, too.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 657e4df31..30f60fffe 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -35,6 +35,7 @@ def load_django_models(): # pylint: enable=W0602 try: + import django from django.db import models HAS_DJANGO = True except ImportError: @@ -99,6 +100,9 @@ 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""" |