From 8cf85423a1c95ed633997a6cd3087047873e0929 Mon Sep 17 00:00:00 2001 From: Tobias Macey Date: Mon, 21 Oct 2024 10:24:19 -0400 Subject: [PATCH] config,fix: Use newer celery beat config prefix For Celery > 4.4 the beat references in the Django config need to be structured as `CELERY_BEAT` instead of `CELERYBEAT` --- .../templates/edxapp/mitx-staging/common_values.yml.tmpl | 2 +- .../edxapp_v2/templates/edxapp/mitx/common_values.yml.tmpl | 2 +- .../templates/edxapp/mitxonline/common_values.yml.tmpl | 4 ++-- .../edxapp_v2/templates/edxapp/xpro/common_values.yml.tmpl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitx-staging/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitx-staging/common_values.yml.tmpl index 81c53e96c..13583016e 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitx-staging/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitx-staging/common_values.yml.tmpl @@ -181,7 +181,7 @@ CACHES: # MODIFIED <<: *redis_cache_config KEY_PREFIX: staticfiles CANVAS_BASE_URL: {{ key "edxapp/canvas-url" }} -CELERYBEAT_SCHEDULER: redbeat.RedBeatScheduler # MODIFIED +CELERY_BEAT_SCHEDULER: redbeat.RedBeatScheduler # MODIFIED CELERY_BROKER_HOSTNAME: edxapp-redis.service.consul:6379 # MODIFIED CELERY_BROKER_TRANSPORT: rediss # MODIFIED - second "s" indicates "secure" CELERY_BROKER_USER: default # MODIFIED diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitx/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitx/common_values.yml.tmpl index 4d3a8477f..1afe610d4 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitx/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitx/common_values.yml.tmpl @@ -182,7 +182,7 @@ CACHES: # MODIFIED <<: *redis_cache_config KEY_PREFIX: staticfiles CANVAS_BASE_URL: {{ key "edxapp/canvas-url" }} -CELERYBEAT_SCHEDULER: redbeat.RedBeatScheduler # MODIFIED +CELERY_BEAT_SCHEDULER: redbeat.RedBeatScheduler # MODIFIED CELERY_BROKER_HOSTNAME: edxapp-redis.service.consul:6379 # MODIFIED CELERY_BROKER_TRANSPORT: rediss # MODIFIED - second "s" indicates "secure" CELERY_BROKER_USER: default # MODIFIED diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl index d054b8074..d86b198ff 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl @@ -178,7 +178,7 @@ CACHES: # MODIFIED staticfiles: <<: *redis_cache_config KEY_PREFIX: staticfiles -CELERYBEAT_SCHEDULE: +CELERY_BEAT_SCHEDULE: send-email-digest: task: openedx.core.djangoapps.notifications.emails.tasks.send_digest_email_to_all_users schedule: @@ -189,7 +189,7 @@ CELERYBEAT_SCHEDULE: month_of_year: "*" args: - "Daily" -CELERYBEAT_SCHEDULER: redbeat.RedBeatScheduler # MODIFIED +CELERY_BEAT_SCHEDULER: redbeat.RedBeatScheduler # MODIFIED CELERY_BROKER_HOSTNAME: edxapp-redis.service.consul:6379 # MODIFIED CELERY_BROKER_TRANSPORT: rediss # MODIFIED - second "s" indicates "secure" CELERY_BROKER_USER: default # MODIFIED diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/xpro/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/xpro/common_values.yml.tmpl index fb64910dc..a3e06c0f2 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/xpro/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/xpro/common_values.yml.tmpl @@ -178,7 +178,7 @@ CACHES: # MODIFIED staticfiles: <<: *redis_cache_config KEY_PREFIX: staticfiles -CELERYBEAT_SCHEDULER: redbeat.RedBeatScheduler # MODIFIED +CELERY_BEAT_SCHEDULER: redbeat.RedBeatScheduler # MODIFIED CELERY_BROKER_HOSTNAME: edxapp-redis.service.consul:6379 # MODIFIED CELERY_BROKER_TRANSPORT: rediss # MODIFIED - second "s" indicates "secure" CELERY_BROKER_USER: default # MODIFIED