From 48fe4ad10bddc58579bdcbe29dea00c86fe1f831 Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Wed, 1 Mar 2017 15:23:37 -0500 Subject: [PATCH] Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set --- lms/envs/aws.py | 6 +++++- lms/envs/devstack.py | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 4f5aab5e7e..72f912e749 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -176,7 +176,11 @@ EDXMKTG_LOGGED_IN_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_LOGGED_IN_COOKIE_NAME', EDXMKTG_USER_INFO_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_USER_INFO_COOKIE_NAME', EDXMKTG_USER_INFO_COOKIE_NAME) LMS_ROOT_URL = ENV_TOKENS.get('LMS_ROOT_URL') -ENTERPRISE_API_URL = ENV_TOKENS.get('ENTERPRISE_API_URL', LMS_ROOT_URL + '/enterprise/api/v1/') + +DEFAULT_ENTERPRISE_API_URL = None +if LMS_ROOT_URL is not None: + DEFAULT_ENTERPRISE_API_URL = LMS_ROOT_URL + '/enterprise/api/v1/' +ENTERPRISE_API_URL = ENV_TOKENS.get('ENTERPRISE_API_URL', DEFAULT_ENTERPRISE_API_URL) ENV_FEATURES = ENV_TOKENS.get('FEATURES', {}) for feature, value in ENV_FEATURES.items(): diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index 7243c31302..12806a10d5 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -20,6 +20,7 @@ CELERY_ALWAYS_EAGER = True HTTPS = 'off' LMS_ROOT_URL = 'http://localhost:8000' +ENTERPRISE_API_URL = LMS_ROOT_URL + '/enterprise/api/v1/' ################################ LOGGERS ######################################