From b7e070e0b9d0997b814ea5e2b53492cd2787218a Mon Sep 17 00:00:00 2001
From: Kevin Falcone <kevin@edx.org>
Date: Tue, 2 Feb 2016 12:52:23 -0500
Subject: [PATCH] Switch to using the edxapp-migrate-(lms|cms) tools
edxapp-migrate-lms figures out at system build time what databases
it needs to migrate (just default, or default + student_module_history).
This avoids paver needing to be clever about figuring out if a user has
enabled the split CSMHE databases flag and permits this to merge early
and safely.
We can turn the CSMHE flag on from configuration at the same time we
enable all of the database config and ensure that the new database is
created. Until a devstack is provisioned using that version of
configuration, it'll continue to have 1 DB and migrate 1 DB. This
allows us to better control deployment.
---
pavelib/paver_tests/test_servers.py | 3 ++-
pavelib/servers.py | 8 ++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pavelib/paver_tests/test_servers.py b/pavelib/paver_tests/test_servers.py
index 1c3b2f6..033e93e 100644
--- a/pavelib/paver_tests/test_servers.py
+++ b/pavelib/paver_tests/test_servers.py
@@ -155,7 +155,8 @@ class TestPaverServerTasks(PaverTestCase):
"""
settings = options.get("settings", "devstack")
call_task("pavelib.servers.update_db", options=options)
- db_command = "python manage.py {server} --settings={settings} migrate --traceback --pythonpath=."
+ # pylint: disable=line-too-long
+ db_command = "NO_EDXAPP_SUDO=1 EDX_PLATFORM_SETTINGS_OVERRIDE={settings} /edx/bin/edxapp-migrate-{server} --traceback --pythonpath=. "
self.assertEquals(
self.task_messages,
[
diff --git a/pavelib/servers.py b/pavelib/servers.py
index f76fdf9..19d9302 100644
--- a/pavelib/servers.py
+++ b/pavelib/servers.py
@@ -239,12 +239,16 @@ def run_all_servers(options):
])
def update_db(options):
"""
- Runs syncdb and then migrate.
+ Migrates the lms and cms across all databases
"""
settings = getattr(options, 'settings', DEFAULT_SETTINGS)
fake = "--fake-initial" if getattr(options, 'fake_initial', False) else ""
for system in ('lms', 'cms'):
- sh(django_cmd(system, settings, 'migrate', fake, '--traceback', '--pythonpath=.'))
+ # pylint: disable=line-too-long
+ sh("NO_EDXAPP_SUDO=1 EDX_PLATFORM_SETTINGS_OVERRIDE={settings} /edx/bin/edxapp-migrate-{system} --traceback --pythonpath=. {fake}".format(
+ settings=settings,
+ system=system,
+ fake=fake))
@task
--
libgit2 0.26.0