From 0871dc70ab51599781bd159162b911563a3a7987 Mon Sep 17 00:00:00 2001 From: Chris Pappas Date: Fri, 24 May 2024 12:05:39 -0400 Subject: [PATCH 1/2] fix: update ansible to let ecomworker deploy from 2u/main --- playbooks/roles/ecomworker/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/ecomworker/defaults/main.yml b/playbooks/roles/ecomworker/defaults/main.yml index 59bae85240c..d5643c0b46e 100644 --- a/playbooks/roles/ecomworker/defaults/main.yml +++ b/playbooks/roles/ecomworker/defaults/main.yml @@ -11,7 +11,7 @@ # ECOMMERCE_WORKER_GIT_IDENTITY: !!null -ECOMMERCE_WORKER_VERSION: 'master' +ECOMMERCE_WORKER_VERSION: '2u/main' ECOMMERCE_WORKER_USE_PYTHON38: true ECOMMERCE_WORKER_REPOS: From d5248716238bd87673c01fa3b5fa7933418d2399 Mon Sep 17 00:00:00 2001 From: Chris Pappas Date: Fri, 24 May 2024 12:06:20 -0400 Subject: [PATCH 2/2] fix: revert queue arg for ecomworker celery --- .../ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 b/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 index 648c97f5598..ddd621424e7 100644 --- a/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 +++ b/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 @@ -26,4 +26,4 @@ export DD_TRACE_LOG_STREAM_HANDLER=false source {{ ecommerce_worker_home }}/{{ ecommerce_worker_service_name }}_env # We exec so that celery is the child of supervisor and can be managed properly -exec {{ executable }} -A ecommerce_worker.celery_app:app worker --concurrency={{ ECOMMERCE_WORKER_CONCURRENCY }} --loglevel=info --hostname=ecomworker.%%h --queues=ecommerce.fulfillment,ecommerce.email_marketing,ecommerce.default +exec {{ executable }} -A ecommerce_worker.celery_app:app worker --concurrency={{ ECOMMERCE_WORKER_CONCURRENCY }} --loglevel=info --hostname=ecomworker.%%h --queue=ecommerce.fulfillment,ecommerce.email_marketing,ecommerce.default