Merge branch 'master' into 1.4.x

Conflicts:
	doc/appendix/contributors.txt
	schemas/bundle.xsd
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Server/Encryption.py
	src/lib/Bcfg2/Server/Lint/Genshi.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Decisions.py
	src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
	tools/bcfg2-profile-templates.py

1 files changed, 9 insertions, 0 deletions

diff --git a/tools/upgrade/1.3/migrate_dbstats.py b/tools/upgrade/1.3/migrate_dbstats.py
index 15bd328f9..69d9514df 100755
--- a/tools/upgrade/1.3/migrate_dbstats.py
+++ b/tools/upgrade/1.3/migrate_dbstats.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import os
+os.environ['BCFG2_LEGACY_MODELS'] = '1'
 os.environ['DJANGO_SETTINGS_MODULE'] = 'Bcfg2.settings'
 
 import sys
@@ -217,6 +218,14 @@ def migrate_stage1():
 def _restructure():
     """major restructure of reporting data"""
 
+    # run any migrations from the previous schema
+    try:
+      from Bcfg2.Server.Reports.updatefix import update_database
+      update_database()
+    except:
+        logger.error("Failed to run legacy schema updates", exc_info=1)
+        return False
+
     # try to avoid dangling transactions
     if not migrate_stage1():
         return