diff --git a/CHANGELOG.md b/CHANGELOG.md index 5949c0406b0..aa4ec9165a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. Add any new changes to the top (right below this line). + - 2022-05-26 + - Role: edxapp + - Added a new `CELERY_RESULT_BACKEND` setting to allow operators to + override the default celery result backend. + - 2022-01-06 - Role: edx_notes_api - Replaced `ELASTICSEARCH_URL` with `ELASTICSEARCH_DSL` in `edx_notes_api_service_config`. diff --git a/docker/build/edxapp/lms.yml b/docker/build/edxapp/lms.yml index 4ed12a699ba..3f3772c351a 100644 --- a/docker/build/edxapp/lms.yml +++ b/docker/build/edxapp/lms.yml @@ -113,6 +113,7 @@ CELERY_QUEUES: - edx.lms.core.high - edx.lms.core.high_mem CELERY_TIMEZONE: UTC +CELERY_RESULT_BACKEND: django-cache CERTIFICATE_TEMPLATE_LANGUAGES: en: English es: Español diff --git a/docker/build/edxapp/studio.yml b/docker/build/edxapp/studio.yml index fae9165f9ad..e0c136ea669 100644 --- a/docker/build/edxapp/studio.yml +++ b/docker/build/edxapp/studio.yml @@ -92,6 +92,7 @@ CELERY_QUEUES: - edx.cms.core.default - edx.cms.core.high CELERY_TIMEZONE: UTC +CELERY_RESULT_BACKEND: django-cache CERTIFICATE_TEMPLATE_LANGUAGES: en: English es: Español diff --git a/playbooks/roles/edxapp/defaults/main.yml b/playbooks/roles/edxapp/defaults/main.yml index 6fc671faee5..b07e6a8da0e 100644 --- a/playbooks/roles/edxapp/defaults/main.yml +++ b/playbooks/roles/edxapp/defaults/main.yml @@ -174,6 +174,7 @@ EDXAPP_CELERY_BROKER_USE_SSL: false EDXAPP_CELERY_EVENT_QUEUE_TTL: !!null EDXAPP_CELERY_TIMEZONE: "UTC" EDXAPP_CELERYBEAT_SCHEDULER: "celery.beat:PersistentScheduler" +EDXAPP_CELERY_RESULT_BACKEND: "django-cache" EDXAPP_ENABLE_CELERY_BEAT: false EDXAPP_SINGLE_BEAT_LOCK_TIME: 60 # EDXAPP_SINGLE_BEAT_HEARTBEAT_INTERVAL must be smaller than EDXAPP_SINGLE_BEAT_LOCK_TIME / 2 @@ -1298,6 +1299,7 @@ generic_env_config: &edxapp_generic_env CELERY_BROKER_VHOST: "{{ EDXAPP_CELERY_BROKER_VHOST }}" CELERY_BROKER_USE_SSL: "{{ EDXAPP_CELERY_BROKER_USE_SSL }}" CELERY_EVENT_QUEUE_TTL: "{{ EDXAPP_CELERY_EVENT_QUEUE_TTL }}" + CELERY_RESULT_BACKEND: "{{ EDXAPP_CELERY_RESULT_BACKEND }}" PAYMENT_SUPPORT_EMAIL: "{{ EDXAPP_PAYMENT_SUPPORT_EMAIL }}" ZENDESK_URL: "{{ EDXAPP_ZENDESK_URL }}" ZENDESK_CUSTOM_FIELDS: "{{ EDXAPP_ZENDESK_CUSTOM_FIELDS }}"