Merge pull request #220 from edx/pwnage101/enable-enterprise-before-plugins

fix: enable the enterprise feature BEFORE plugins are loaded

Author: pwnage101

configuration_files/lms.yml

@@ -303,14 +303,19 @@ ELASTIC_SEARCH_CONFIG:
 -   host: edx.devstack.elasticsearch
     port: 9200
     use_ssl: false
-ENABLE_MKTG_SITE: true 
+ENABLE_MKTG_SITE: true
 EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend
 EMAIL_HOST: localhost
 EMAIL_HOST_PASSWORD: ''
 EMAIL_HOST_USER: ''
 EMAIL_PORT: 25
 EMAIL_USE_TLS: false
 ENABLE_COMPREHENSIVE_THEMING: false
+# Enable enterprise integration.
+# See https://github.com/openedx/edx-enterprise/blob/master/docs/development.rst for
+# more background on edx-enterprise.
+# Toggle this off if you don't want anything to do with enterprise in devstack.
+ENABLE_ENTERPRISE_INTEGRATION: true
 ENTERPRISE_API_URL: http://edx.devstack.lms:18000/enterprise/api/v1
 ENTERPRISE_COURSE_ENROLLMENT_AUDIT_MODES:
 - audit

py_configuration_files/lms.py

@@ -415,12 +415,6 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 ENABLE_DISCUSSION_SERVICE = True
 SHOW_HEADER_LANGUAGE_SELECTOR = True
 
-# Enable enterprise integration by default.
-# See https://github.com/openedx/edx-enterprise/blob/master/docs/development.rst for
-# more background on edx-enterprise.
-# Toggle this off if you don't want anything to do with enterprise in devstack.
-ENABLE_ENTERPRISE_INTEGRATION = True
-
 ENABLE_MKTG_SITE = os.environ.get('ENABLE_MARKETING_SITE', False)
 
 MKTG_URLS = {