From ff7810d7774a80668ed0681df97b7faff291a060 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Mon, 3 Feb 2014 14:49:41 -0500 Subject: [PATCH] adding db overrides to aws_migrate.py --- lms/envs/aws_migrate.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/lms/envs/aws_migrate.py b/lms/envs/aws_migrate.py index 726b09874c..b06bb7b13c 100644 --- a/lms/envs/aws_migrate.py +++ b/lms/envs/aws_migrate.py @@ -1,6 +1,6 @@ """ -A Django settings file for use on AWS while running -database migrations, since we don't want to normally run the +A Django settings file for use on AWS while running +database migrations, since we don't want to normally run the LMS with enough privileges to modify the database schema. """ @@ -13,12 +13,17 @@ from .aws import * import os from django.core.exceptions import ImproperlyConfigured -USER = os.environ.get('DB_MIGRATION_USER', 'root') -PASSWORD = os.environ.get('DB_MIGRATION_PASS', None) +DB_OVERRIDES = dict( + USER=os.environ.get('DB_MIGRATION_USER', 'root'), + PASSWORD=os.environ.get('DB_MIGRATION_PASS', None), + NAME=os.environ.get('DB_MIGRATION_NAME', DATABASES['default']['NAME']), + HOST=os.environ.get('DB_MIGRATION_HOST', DATABASES['default']['HOST']), + PORT=os.environ.get('DB_MIGRATION_PORT', DATABASES['default']['PORT']), +) -if not PASSWORD: - raise ImproperlyConfigured("No database password was provided for running " - "migrations. This is fatal.") +if not DB_OVERRIDES['PASSWORD']: + raise ImproperlyConfigured("No database password was provided for running " + "migrations. This is fatal.") -DATABASES['default']['USER'] = USER -DATABASES['default']['PASSWORD'] = PASSWORD +for override, value in DB_OVERRIDES.iteritems(): + DATABASES['default'][override] = value