Merge pull request #634 from jasonthomas/cleanup-db-settings

Remove DATABASES related settings from sites settings.

requirements/prod.txt

@@ -6,7 +6,6 @@ billiard==2.7.3.28
 cef==0.5
 celery==3.0.19
 curling==0.3.9.5
-dj-database-url==0.2.1
 django-cache-nuggets==0.1.1
 django_csp==2.0.2
 django-celery==3.0.17

webpay/settings/sites/altdev/settings_base.py

@@ -1,5 +1,4 @@
 """private_base will be populated from puppet and placed in this directory"""
-import dj_database_url
 import private_base as private
 
 from webpay.settings import base
@@ -9,19 +8,6 @@
 DOMAIN = 'marketplace-altdev.allizom.org'
 ALLOWED_HOSTS = [DOMAIN]
 
-DATABASES = {}
-DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
-DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-
-DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
-DATABASES['slave']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-# Uncomment this and set to all slave DBs in use on the site.
-SLAVE_DATABASES = ['slave']
-
 CACHE_PREFIX = private.CACHE_PREFIX
 
 CACHES = {

webpay/settings/sites/dev/settings_base.py

@@ -1,5 +1,4 @@
 """private_base will be populated from puppet and placed in this directory"""
-import dj_database_url
 import private_base as private
 
 from webpay.settings import base
@@ -9,19 +8,6 @@
 DOMAIN = 'marketplace-dev.allizom.org'
 ALLOWED_HOSTS = [DOMAIN]
 
-DATABASES = {}
-DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
-DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-
-DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
-DATABASES['slave']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-# Uncomment this and set to all slave DBs in use on the site.
-SLAVE_DATABASES = ['slave']
-
 CACHE_PREFIX = private.CACHE_PREFIX
 
 CACHES = {

webpay/settings/sites/identitystage/settings_base.py

@@ -1,5 +1,4 @@
 """private_base will be populated from puppet and placed in this directory"""
-import dj_database_url
 import private_base as private
 
 from webpay.settings import base
@@ -9,18 +8,6 @@
 DOMAIN = 'identity-stage-marketplace.allizom.org'
 ALLOWED_HOSTS = [DOMAIN]
 
-DATABASES = {}
-DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
-DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-
-DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
-DATABASES['slave']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-SLAVE_DATABASES = ['slave']
-
 CACHE_PREFIX = private.CACHE_PREFIX
 
 CACHES = {

webpay/settings/sites/paymentsalt/settings_base.py

@@ -1,5 +1,4 @@
 """private_base will be populated from puppet and placed in this directory"""
-import dj_database_url
 import private_base as private
 
 from webpay.settings import base
@@ -9,18 +8,6 @@
 DOMAIN = 'payments-alt.allizom.org'
 ALLOWED_HOSTS = [DOMAIN]
 
-DATABASES = {}
-DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
-DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-
-DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
-DATABASES['slave']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-SLAVE_DATABASES = ['slave']
-
 CACHE_PREFIX = private.CACHE_PREFIX
 
 CACHES = {

webpay/settings/sites/prod/settings_base.py

@@ -1,5 +1,4 @@
 """private_base will be populated from puppet and placed in this directory"""
-import dj_database_url
 import private_base as private
 
 from webpay.settings import base
@@ -9,18 +8,6 @@
 DOMAIN = 'marketplace.firefox.com'
 ALLOWED_HOSTS = [DOMAIN]
 
-DATABASES = {}
-DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
-DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-
-DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
-DATABASES['slave']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-SLAVE_DATABASES = ['slave']
-
 CACHE_PREFIX = private.CACHE_PREFIX
 
 CACHES = {

webpay/settings/sites/stage/settings_base.py

@@ -1,5 +1,4 @@
 """private_base will be populated from puppet and placed in this directory"""
-import dj_database_url
 import private_base as private
 
 from webpay.settings import base
@@ -9,18 +8,6 @@
 DOMAIN = 'marketplace.allizom.org'
 ALLOWED_HOSTS = [DOMAIN]
 
-DATABASES = {}
-DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
-DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-
-DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
-DATABASES['slave']['ENGINE'] = 'django.db.backends.mysql'
-DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
-
-SLAVE_DATABASES = ['slave']
-
 CACHE_PREFIX = private.CACHE_PREFIX
 
 CACHES = {