Merge pull request #15445 from edx/jmbowman/PLAT-1499

PLAT-1499 Use appropriate default settings in Docker devstack

lms/envs/devstack_optimized.py

@@ -18,9 +18,14 @@ as they are for non-optimized devstack. Instead, update_assets must be
 invoked each time that changes have been made.
 """
 
+import os
+
 ########################## Devstack settings ###################################
 
-from .devstack import *  # pylint: disable=wildcard-import, unused-wildcard-import
+if 'BOK_CHOY_HOSTNAME' in os.environ:
+    from .devstack_docker import *  # pylint: disable=wildcard-import, unused-wildcard-import
+else:
+    from .devstack import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 TEST_ROOT = REPO_ROOT / "test_root"
 

lms/envs/devstack_with_worker.py

@@ -11,10 +11,15 @@ In two separate processes on devstack:
     ./manage.py lms celery worker --settings=devstack_with_worker
 """
 
+import os
+
 # We intentionally define lots of variables that aren't used, and
 # want to import all variables from base settings files
 # pylint: disable=wildcard-import, unused-wildcard-import
-from lms.envs.devstack import *
+if 'BOK_CHOY_HOSTNAME' in os.environ:
+    from lms.envs.devstack_docker import *
+else:
+    from lms.envs.devstack import *
 
 # Require a separate celery worker
 CELERY_ALWAYS_EAGER = False