From e33b4614af24904ce87ffc0e65fc320548bd2194 Mon Sep 17 00:00:00 2001 From: Brittney Exline Date: Fri, 10 Jan 2020 14:48:23 -0700 Subject: [PATCH] ENT-2475 Upgrading edx-enterprise and adding settings for enterprise catalog service --- lms/envs/common.py | 1 + lms/envs/production.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lms/envs/common.py b/lms/envs/common.py index 10f58599aa..517b676f15 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3578,6 +3578,7 @@ ENTERPRISE_CONSENT_API_URL = LMS_INTERNAL_ROOT_URL + '/consent/api/v1/' ENTERPRISE_SERVICE_WORKER_USERNAME = 'enterprise_worker' ENTERPRISE_API_CACHE_TIMEOUT = 3600 # Value is in seconds ENTERPRISE_CUSTOMER_LOGO_IMAGE_SIZE = 512 # Enterprise logo image size limit in KB's +ENTERPRISE_CATALOG_INTERNAL_ROOT_URL = 'http://enterprise.catalog.app:18160' ############## ENTERPRISE SERVICE LMS CONFIGURATION ################################## # The LMS has some features embedded that are related to the Enterprise service, but diff --git a/lms/envs/production.py b/lms/envs/production.py index 557a716b7a..2e54a4b954 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -1025,6 +1025,11 @@ ENTERPRISE_API_CACHE_TIMEOUT = ENV_TOKENS.get( 'ENTERPRISE_API_CACHE_TIMEOUT', ENTERPRISE_API_CACHE_TIMEOUT ) +ENTERPRISE_CATALOG_INTERNAL_ROOT_URL = ENV_TOKENS.get( + 'ENTERPRISE_CATALOG_INTERNAL_ROOT_URL', + ENTERPRISE_CATALOG_INTERNAL_ROOT_URL +) + ############## ENTERPRISE SERVICE LMS CONFIGURATION ################################## # The LMS has some features embedded that are related to the Enterprise service, but