Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 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"

7
cms/envs/devstack_with_worker.py
View File

@@ -11,10 +11,15 @@ In two separate processes on devstack:
./manage.py cms 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 cms.envs.devstack import *
if 'BOK_CHOY_HOSTNAME' in os.environ:
from cms.envs.devstack_docker import *
else:
from cms.envs.devstack import *
# Require a separate celery worker
CELERY_ALWAYS_EAGER = False