Merge pull request #348 from helgi/prune_settings

Clean up the settings file a bit

Author: helgi

rootfs/api/models/__init__.py

@@ -51,9 +51,7 @@ class Meta:
     @property
     def _scheduler(self):
         mod = importlib.import_module(settings.SCHEDULER_MODULE)
-        return mod.SchedulerClient(settings.SCHEDULER_URL,
-                                   settings.SCHEDULER_AUTH,
-                                   settings.SCHEDULER_OPTIONS)
+        return mod.SchedulerClient(settings.SCHEDULER_URL)
 
 
 class UuidAuditedModel(AuditedModel):

rootfs/deis/settings.py

@@ -8,24 +8,22 @@
 import sys
 import tempfile
 
-
-PROJECT_ROOT = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))
-
+# A boolean that turns on/off debug mode.
+# https://docs.djangoproject.com/en/1.9/ref/settings/#debug
 DEBUG = False
 
+# If set to True, Django's normal exception handling of view functions
+# will be suppressed, and exceptions will propagate upwards
+# https://docs.djangoproject.com/en/1.9/ref/settings/#debug-propagate-exceptions
+DEBUG_PROPAGATE_EXCEPTIONS = False
+
 # Silence two security messages around SSL as router takes care of them
-# https://docs.djangoproject.com/es/1.9/ref/checks/#security
+# https://docs.djangoproject.com/en/1.9/ref/checks/#security
 SILENCED_SYSTEM_CHECKS = [
     'security.W004',
     'security.W008'
 ]
 
-ADMINS = (
-    # ('Your Name', 'your_email@example.com'),
-)
-
-MANAGERS = ADMINS
-
 CONN_MAX_AGE = 60 * 3
 
 # SECURITY: change this to allowed fqdn's to prevent host poisioning attacks
@@ -44,7 +42,8 @@
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
-USE_I18N = True
+# https://docs.djangoproject.com/en/1.9/ref/settings/#use-i18n
+USE_I18N = False
 
 # If you set this to False, Django will not format dates, numbers and
 # calendars according to the current locale.
@@ -53,19 +52,6 @@
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/var/www/example.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://example.com/media/", "http://media.example.com/"
-MEDIA_URL = ''
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.9/howto/static-files/
-STATIC_URL = '/static/'
-
 # Manage templates
 TEMPLATES = [
     {
@@ -276,8 +262,6 @@
 # default scheduler settings
 SCHEDULER_MODULE = 'scheduler.mock'
 SCHEDULER_URL = 'localhost'
-SCHEDULER_AUTH = None
-SCHEDULER_OPTIONS = None
 
 # security keys and auth tokens
 random_secret = 'CHANGEME_sapm$s%upvsw5l_zuy_&29rkywd^78ff(qi*#@&*^'

rootfs/scheduler/__init__.py

@@ -235,8 +235,8 @@ def unhealthy(status_code):
 
 class KubeHTTPClient(AbstractSchedulerClient):
 
-    def __init__(self, target, auth, options):
-        super(KubeHTTPClient, self).__init__(target, auth, options)
+    def __init__(self, target):
+        super(KubeHTTPClient, self).__init__(target)
         self.url = settings.SCHEDULER_URL
         self.registry = settings.REGISTRY_URL
         self.apiversion = "v1"

rootfs/scheduler/abstract.py

@@ -4,10 +4,8 @@ class AbstractSchedulerClient(object):
     A generic interface to a scheduler backend.
     """
 
-    def __init__(self, target, auth, options):
+    def __init__(self, target):
         self.target = target
-        self.auth = auth
-        self.options = options
 
     def create(self, name, image, command, **kwargs):
         """Create a new container."""