Merge pull request #2557 from open-craft/smarnach/supervisord-workaround

Work around a supervisord bug causing the provisioning to hang intermittently.

playbooks/roles/edxapp/tasks/deploy.yml

@@ -367,21 +367,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
@@ -431,21 +429,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