diff --git a/CHANGELOG.md b/CHANGELOG.md index fe09ad67828..e6c1bfb6706 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,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-06-08 + - Role: edxapp + - Added a new `CELERY_RESULT_BACKEND` setting to allow operators to + override the default celery result backend. + - 2022-06-06 - Role: common - Remove PPA for `watchman` as we have shifted to Ubuntu 20.04, diff --git a/docker/build/edxapp/lms.yml b/docker/build/edxapp/lms.yml index fe809bb5513..9463740bac5 100644 --- a/docker/build/edxapp/lms.yml +++ b/docker/build/edxapp/lms.yml @@ -108,6 +108,7 @@ CELERY_BROKER_USE_SSL: false CELERY_BROKER_VHOST: '' CELERY_EVENT_QUEUE_TTL: null 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 037e80ed31e..0339423054a 100644 --- a/docker/build/edxapp/studio.yml +++ b/docker/build/edxapp/studio.yml @@ -89,6 +89,7 @@ CELERY_BROKER_USE_SSL: false CELERY_BROKER_VHOST: '' CELERY_EVENT_QUEUE_TTL: null 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 04293f2abe6..d1048eb809a 100644 --- a/playbooks/roles/edxapp/defaults/main.yml +++ b/playbooks/roles/edxapp/defaults/main.yml @@ -190,6 +190,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 @@ -1345,6 +1346,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 }}"