Merge pull request #4597 from edx/jibsheet/remove-supervisor-groups-edxapp

Stop having edxapp: for edxapp:lms edxapp:cms

playbooks/edx-east/ora2.yml

@@ -26,9 +26,6 @@
       environment:
         PATH: "{{ edxapp_deploy_path }}"
       become_user: "{{ edxapp_user }}"
-      notify:
-        - "restart edxapp"
-        - "restart workers"
       tags:
         - deploy
 
@@ -39,15 +36,14 @@
       environment:
         DB_MIGRATION_USER: "{{ edxapp_mysql_user }}"
         DB_MIGRATION_PASS: "{{ edxapp_mysql_password }}"
-      notify:
-        - "restart edxapp"
-        - "restart workers"
       tags:
         - deploy
 
-  handlers:
-    - name: restart edxapp
-      shell: "{{ supervisorctl_path }} restart edxapp:"
+    - name: restart lms
+      shell: "{{ supervisorctl_path }} restart lms"
+
+    - name: restart studio
+      shell: "{{ supervisorctl_path }} restart cms"
 
     - name: restart workers
       shell: "{{ supervisorctl_path }} restart edxapp_worker:"

playbooks/roles/edxapp/tasks/deploy.yml

@@ -349,12 +349,15 @@
 
 - name: ensure edxapp has started
   supervisorctl:
-    name: "edxapp:"
+    name: "{{ item }}"
     supervisorctl_path: "{{ supervisor_ctl }}"
     config: "{{ supervisor_cfg }}"
     state: started
   become_user: "{{ supervisor_service_user }}"
   when: celery_worker is not defined and not disable_edx_services
+  with_items:
+    - 'lms'
+    - 'cms'
   tags:
     - manage
 
@@ -404,12 +407,15 @@
 
 - name: restart edxapp
   supervisorctl:
-    name: "edxapp:"
+    name: "{{ item }}"
     supervisorctl_path: "{{ supervisor_ctl }}"
     config: "{{ supervisor_cfg }}"
     state: restarted
   when: edxapp_installed is defined and celery_worker is not defined and not disable_edx_services
   become_user: "{{ supervisor_service_user }}"
+  with_items:
+    - 'lms'
+    - 'cms'
   tags:
     - manage
 

playbooks/roles/edxapp/tasks/service_variant_config.yml

@@ -30,8 +30,8 @@
     - install
     - install:configuration
 
-# write the supervisor script for edxapp and celery workers
-- name: writing edxapp and celery supervisor scripts
+# write the supervisor script for celery workers
+- name: writing celery supervisor scripts
   template:
     src: "edx/app/supervisor/conf.d.available/{{ item }}.j2"
     dest: "{{ supervisor_available_dir }}/{{ item }}"
@@ -40,12 +40,21 @@
     mode: 0644
   become_user: "{{ supervisor_user }}"
   with_items:
-    - edxapp.conf
     - workers.conf
   tags:
     - install
     - install:configuration
 
+# clean out an old edxapp.conf file which we don't use now.
+# this can be deleted after we build things from scratch.
+- name: clean out old edxapp.conf
+  file:
+    path: "{{ supervisor_available_dir }}/edxapp.conf"
+    state: "absent"
+  tags:
+    - install
+    - install:configuration
+
 - name: add gunicorn configuration files
   template:
     src: "{{ item }}_gunicorn.py.j2"
@@ -71,18 +80,6 @@
     - install
     - install:configuration
 
-- name: enable edxapp supervisor script
-  file:
-    src: "{{ supervisor_available_dir }}/edxapp.conf"
-    dest: "{{ supervisor_cfg_dir }}/edxapp.conf"
-    state: link
-    force: yes
-  become_user: "{{ supervisor_user }}"
-  when: celery_worker is not defined and not disable_edx_services
-  tags:
-    - install
-    - install:configuration
-
 - name: enable celery worker supervisor script
   file:
     src: "{{ supervisor_available_dir }}/workers.conf"

playbooks/roles/edxapp/templates/edx/app/supervisor/conf.d.available/edxapp.conf.j2

-[group:edxapp]
-programs={{ ",".join(service_variants_enabled) }}