Merge pull request #374 from ucsd-ets/release-candidate

release-2020-06-10
ucsd-ets · Jun 10, 2020 · 4824236 · 4824236
2 parents a0252b7 + 9d1e0a4
commit 4824236
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
@@ -175,11 +175,6 @@ def should_show_debug_toolbar(request):
 from openedx.core.djangoapps.plugins import plugin_settings, constants as plugin_constants
 plugin_settings.add_plugins(__name__, plugin_constants.ProjectType.CMS, plugin_constants.SettingsType.DEVSTACK)
 
-###############################################################################
-# See if the developer has any local overrides.
-if os.path.isfile(join(dirname(abspath(__file__)), 'private.py')):
-    from .private import *  # pylint: disable=import-error,wildcard-import
-
 #####################################################################
 # Lastly, run any migrations, if needed.
 MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE)

diff --git a/cms/envs/devstack_docker.py b/cms/envs/devstack_docker.py
@@ -28,3 +28,8 @@
     'JWT_ISSUER': OAUTH_OIDC_ISSUER,
     'JWT_AUDIENCE': 'lms-key',
 })
+
+###############################################################################
+# See if the developer has any local overrides.
+if os.path.isfile(join(dirname(abspath(__file__)), 'private.py')):
+    from .private import *  # pylint: disable=import-error,wildcard-import
diff --git a/cms/envs/production.py b/cms/envs/production.py
@@ -620,6 +620,7 @@
 
     if FEATURES.get('ENABLE_KAFKA_FOR_CALIPER'):
         CALIPER_KAFKA_SETTINGS = ENV_TOKENS.get('CALIPER_KAFKA_SETTINGS')
+        CALIPER_KAFKA_AUTH_SETTINGS = AUTH_TOKENS.get('CALIPER_KAFKA_AUTH_SETTINGS')
 ####################### Plugin Settings ##########################
 
 # This is at the bottom because it is going to load more settings after base settings are loaded

diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
@@ -264,11 +264,6 @@ def should_show_debug_toolbar(request):
 from openedx.core.djangoapps.plugins import plugin_settings, constants as plugin_constants
 plugin_settings.add_plugins(__name__, plugin_constants.ProjectType.LMS, plugin_constants.SettingsType.DEVSTACK)
 
-#####################################################################
-# See if the developer has any local overrides.
-if os.path.isfile(join(dirname(abspath(__file__)), 'private.py')):
-    from .private import *  # pylint: disable=import-error,wildcard-import
-
 #####################################################################
 # Lastly, run any migrations, if needed.
 MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE)

diff --git a/lms/envs/devstack_docker.py b/lms/envs/devstack_docker.py
@@ -79,3 +79,8 @@
 # Uncomment the lines below if you'd like to see SQL statements in your devstack LMS log.
 # LOGGING['handlers']['console']['level'] = 'DEBUG'
 # LOGGING['loggers']['django.db.backends'] = {'handlers': ['console'], 'level': 'DEBUG', 'propagate': False}
+
+#####################################################################
+# See if the developer has any local overrides.
+if os.path.isfile(join(dirname(abspath(__file__)), 'private.py')):
+    from .private import *  # pylint: disable=import-error,wildcard-import
diff --git a/lms/envs/production.py b/lms/envs/production.py
@@ -1150,6 +1150,8 @@
 
     if FEATURES.get('ENABLE_KAFKA_FOR_CALIPER'):
         CALIPER_KAFKA_SETTINGS = ENV_TOKENS.get('CALIPER_KAFKA_SETTINGS')
+        CALIPER_KAFKA_AUTH_SETTINGS = AUTH_TOKENS.get('CALIPER_KAFKA_AUTH_SETTINGS')
+
 ############################### Plugin Settings ###############################
 
 # This is at the bottom because it is going to load more settings after base settings are loaded

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -179,7 +179,7 @@ numpy==1.6.2
 oauth2==1.9.0.post1
 oauthlib==2.1.0
 openapi-codec==1.3.2      # via django-rest-swagger
-openedx-caliper-tracking==0.11.8
+openedx-caliper-tracking==0.12.1
 path.py==8.2.1
 pathtools==0.1.2
 paver==1.3.4