Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PLAT-1499 Use appropriate default settings in Docker devstack

Browse Source
This commit is contained in:
Jeremy Bowman
2017-06-30 18:28:40 -04:00
parent 8838162abb
commit 353b4c4f67
14 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cms/envs/devstack_optimized.py
View File

@@ -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"