From 043a7c9477d5b8c408fa56b87a671b1cc152f6d8 Mon Sep 17 00:00:00 2001 From: Troy Sankey Date: Wed, 13 May 2026 16:06:53 -0700 Subject: [PATCH] fix: enable the enterprise feature BEFORE plugins are loaded This fixes a devstack-specific bug resulting in enterprise and consent plugin settings not being loaded because the entire enterprise feature was disabled (ENABLE_ENTERPRISE_INTEGRATION = False) when the plugins were loaded. Settings in devstack.py are loaded AFTER plugins are loaded, which makes it a bad place to flip on ENABLE_ENTERPRISE_INTEGRATION because it would be too late. --- configuration_files/lms.yml | 7 ++++++- py_configuration_files/lms.py | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configuration_files/lms.yml b/configuration_files/lms.yml index 1162884..7e00f79 100644 --- a/configuration_files/lms.yml +++ b/configuration_files/lms.yml @@ -303,7 +303,7 @@ 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: '' @@ -311,6 +311,11 @@ 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 diff --git a/py_configuration_files/lms.py b/py_configuration_files/lms.py index 8a60587..5b206ec 100644 --- a/py_configuration_files/lms.py +++ b/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 = {