Merge pull request #759 from helgi/move_deis

Move various pieces out of `deis` to `api`

Author: helgi

Makefile

@@ -67,12 +67,12 @@ test-style:
 
 test-unit:
 	cd rootfs \
-		&& coverage run manage.py test --settings=deis.testing --noinput registry api \
+		&& coverage run manage.py test --settings=api.settings.testing --noinput registry api \
 		&& coverage report -m
 
 test-unit-quick:
 	cd rootfs \
-		&& ./manage.py test --settings=deis.testing --noinput --parallel ${TEST_PROCS} --noinput registry api
+		&& ./manage.py test --settings=api.settings.testing --noinput --parallel ${TEST_PROCS} --noinput registry api
 
 test-functional:
 	@echo "Implement functional tests in _tests directory"

rootfs/api/settings/__init__.py

@@ -87,7 +87,7 @@
 ROOT_URLCONF = 'deis.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'deis.wsgi.application'
+WSGI_APPLICATION = 'api.wsgi.application'
 
 INSTALLED_APPS = (
     'django.contrib.auth',

rootfs/deis/settings.py rootfs/api/settings/production.pyrootfs/deis/settings.py renamed to rootfs/api/settings/production.py

@@ -1,6 +1,6 @@
 import random
 import string
-from deis.settings import *  # noqa
+from api.settings.production import *  # noqa
 
 # A boolean that turns on/off debug mode.
 # https://docs.djangoproject.com/en/1.9/ref/settings/#debug

rootfs/deis/testing.py rootfs/api/settings/testing.pyrootfs/deis/testing.py renamed to rootfs/api/settings/testing.py

@@ -1,5 +1,5 @@
 """
-WSGI config for deis project.
+WSGI config for Deis Workflow Controller project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "deis.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "api.settings.production")
 
 application = get_wsgi_application()

rootfs/deis/wsgi.py rootfs/api/wsgi.pyrootfs/deis/wsgi.py renamed to rootfs/api/wsgi.py

@@ -30,7 +30,7 @@ echo "Database Migrations:"
 sudo -E -u deis python /app/manage.py migrate --noinput
 
 # spawn a gunicorn server in the background
-sudo -E -u deis gunicorn -c /app/deis/gunicorn/config.py deis.wsgi &
+sudo -E -u deis gunicorn -c /app/deis/gunicorn/config.py api.wsgi &
 
 python /app/manage.py load_db_state_to_k8s
 

rootfs/bin/boot

@@ -5,7 +5,7 @@
 
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "deis.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "api.settings.production")
 
     from django.core.management import execute_from_command_line