Merge pull request #393 from bacongobbler/fixup-workflow-settings

fix(local_settings.py): read DATABASES from settings.py

Author: Matthew Fisher

rootfs/conf.d/confd_settings.toml rootfs/conf.d/local_settings.tomlrootfs/conf.d/confd_settings.toml renamed to rootfs/conf.d/local_settings.toml

@@ -1,6 +1,6 @@
 [template]
-src   = "confd_settings.py"
-dest  = "/templates/confd_settings.py"
+src   = "local_settings.py"
+dest  = "/app/deis/local_settings.py"
 uid = 1000
 gid = 1000
 mode  = "0640"

rootfs/deis/settings.py

@@ -5,7 +5,6 @@
 import os.path
 import random
 import string
-import sys
 import tempfile
 
 # A boolean that turns on/off debug mode.
@@ -301,9 +300,3 @@
     from .local_settings import *  # noqa
 except ImportError:
     pass
-
-# have confd_settings within container execution override all others
-# including local_settings (which may end up in the container)
-if os.path.exists('/templates/confd_settings.py'):
-    sys.path.append('/templates')
-    from confd_settings import *  # noqa

rootfs/templates/confd_settings.py rootfs/templates/local_settings.pyrootfs/templates/confd_settings.py renamed to rootfs/templates/local_settings.py

@@ -1,5 +1,7 @@
 import os
 
+from .settings import *
+
 # security keys and auth tokens
 with open('/var/run/secrets/api/builder/auth/builder-key') as f:
     BUILDER_KEY = f.read().strip()