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

Use production.py instead of aws.py

Browse Source
This commit is contained in:
Cory Lee
2018-10-02 13:38:48 -04:00
parent 912ec712ea
commit bd6e060ea7
9 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/aws.py
View File

@@ -9,7 +9,6 @@ This is the default template for our main set of AWS servers.
import json
import os
import logging
import logging.config
from path import Path as path
from xmodule.modulestore.modulestore_settings import convert_module_store_setting_if_needed
@@ -609,5 +608,4 @@ plugin_settings.add_plugins(__name__, plugin_constants.ProjectType.CMS, plugin_c
derive_settings(__name__)
logging.config.dictConfig(LOGGING)
logging.warn('DEPRECATION WARNING: aws.py has been deprecated, you should use production.py instead.')

2
cms/envs/bok_choy.py
View File

@@ -24,7 +24,7 @@ from openedx.core.release import RELEASE_LINE
os.environ['SERVICE_VARIANT'] = 'bok_choy_docker' if 'BOK_CHOY_HOSTNAME' in os.environ else 'bok_choy'
os.environ['CONFIG_ROOT'] = path(__file__).abspath().dirname()
from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
from .production import * # pylint: disable=wildcard-import, unused-wildcard-import, wrong-import-position
######################### Testing overrides ####################################

2
cms/envs/devstack.py
View File

@@ -4,7 +4,7 @@ Specific overrides to the base prod settings to make development easier.
from os.path import abspath, dirname, join
from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
from .production import * # pylint: disable=wildcard-import, unused-wildcard-import
# Don't use S3 in devstack, fall back to filesystem
del DEFAULT_FILE_STORAGE

2
cms/envs/openstack.py
View File

@@ -4,7 +4,7 @@ Settings for OpenStack deployments.
# We import the aws settings because that's currently where the base settings are stored for all deployments.
# TODO - fix this when aws.py is split/renamed.
from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
from .production import * # pylint: disable=wildcard-import, unused-wildcard-import
SWIFT_AUTH_URL = AUTH_TOKENS.get('SWIFT_AUTH_URL')
SWIFT_AUTH_VERSION = AUTH_TOKENS.get('SWIFT_AUTH_VERSION', 1)

2
lms/envs/aws.py
View File

@@ -21,7 +21,6 @@ import datetime
import json
import os
import logging
import logging.config
import dateutil
from path import Path as path
@@ -1108,5 +1107,4 @@ plugin_settings.add_plugins(__name__, plugin_constants.ProjectType.LMS, plugin_c
derive_settings(__name__)
logging.config.dictConfig(LOGGING)
logging.warn('DEPRECATION WARNING: aws.py has been deprecated, you should use production.py instead.')

2
lms/envs/bok_choy.py
View File

@@ -28,7 +28,7 @@ TEST_ROOT = CONFIG_ROOT.dirname().dirname() / "test_root"
os.environ['SERVICE_VARIANT'] = 'bok_choy_docker' if 'BOK_CHOY_HOSTNAME' in os.environ else 'bok_choy'
os.environ['CONFIG_ROOT'] = CONFIG_ROOT
from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
from .production import * # pylint: disable=wildcard-import, unused-wildcard-import, wrong-import-position
######################### Testing overrides ####################################

2
lms/envs/devstack.py
View File

@@ -3,7 +3,7 @@ Specific overrides to the base prod settings to make development easier.
"""
from os.path import abspath, dirname, join
from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
from .production import * # pylint: disable=wildcard-import, unused-wildcard-import
# Don't use S3 in devstack, fall back to filesystem
del DEFAULT_FILE_STORAGE

2
lms/envs/load_test.py
View File

@@ -6,7 +6,7 @@ Settings for load testing.
# want to import all variables from base settings files
# pylint: disable=wildcard-import, unused-wildcard-import
from .aws import *
from .production import *
# Disable CSRF for load testing
EXCLUDE_CSRF = lambda elem: elem not in [

2
lms/envs/openstack.py
View File

@@ -4,7 +4,7 @@ Settings for OpenStack deployments.
# We import the aws settings because that's currently where the base settings are stored for all deployments.
# TODO - fix this when aws.py is split/renamed.
from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
from .production import * # pylint: disable=wildcard-import, unused-wildcard-import
SWIFT_AUTH_URL = AUTH_TOKENS.get('SWIFT_AUTH_URL')
SWIFT_AUTH_VERSION = AUTH_TOKENS.get('SWIFT_AUTH_VERSION', 1)