From e8e315488446c064c2214c82c40915a8df3dccf1 Mon Sep 17 00:00:00 2001 From: Sven Marnach Date: Sun, 6 Dec 2015 16:17:07 +0100 Subject: [PATCH] Work around a supervisord bug causing the provisioning to hang intermittently. --- playbooks/roles/edxapp/tasks/deploy.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/playbooks/roles/edxapp/tasks/deploy.yml b/playbooks/roles/edxapp/tasks/deploy.yml index a55e8f7cd88..b407268e8fc 100644 --- a/playbooks/roles/edxapp/tasks/deploy.yml +++ b/playbooks/roles/edxapp/tasks/deploy.yml @@ -365,21 +365,19 @@ state=started supervisorctl_path={{ supervisor_ctl }} config={{ supervisor_cfg }} - name="edxapp:{{ item }}" + name="edxapp:" sudo_user: "{{ supervisor_service_user }}" when: celery_worker is not defined and not disable_edx_services - with_items: service_variants_enabled tags: - manage - name: ensure edxapp_workers has started supervisorctl: > - name="edxapp_worker:{{ item.service_variant }}_{{ item.queue }}_{{ item.concurrency }}" + name="edxapp_worker:" supervisorctl_path={{ supervisor_ctl }} config={{ supervisor_cfg }} state=started when: celery_worker is defined and not disable_edx_services - with_items: edxapp_workers sudo_user: "{{ supervisor_service_user }}" tags: - manage @@ -429,21 +427,19 @@ state=restarted supervisorctl_path={{ supervisor_ctl }} config={{ supervisor_cfg }} - name="edxapp:{{ item }}" + name="edxapp:" when: edxapp_installed is defined and celery_worker is not defined and not disable_edx_services sudo_user: "{{ supervisor_service_user }}" - with_items: service_variants_enabled tags: - manage - name: restart edxapp_workers supervisorctl: > - name="edxapp_worker:{{ item.service_variant }}_{{ item.queue }}_{{ item.concurrency }}" + name="edxapp_worker:" supervisorctl_path={{ supervisor_ctl }} config={{ supervisor_cfg }} state=restarted when: edxapp_installed is defined and celery_worker is defined and not disable_edx_services - with_items: edxapp_workers sudo_user: "{{ common_web_user }}" tags: - manage