Standardize xqwatcher supervisor config

Previously, xqwatcher put supervisor in its own app dir for historical
reasons. This change brings xqwatcher in line with how the rest of our
IDAs use supervisor.

playbooks/roles/xqwatcher/defaults/main.yml

@@ -100,21 +100,6 @@ xqwatcher_module: "xqueue_watcher"
 xqwatcher_venv_base: "{{ xqwatcher_app_dir }}/venvs"
 xqwatcher_venv_dir: "{{ xqwatcher_venv_base }}/{{ xqwatcher_service_name }}"
 
-
-#
-# supervisor related config
-#
-xqwatcher_supervisor_app_dir: "{{ xqwatcher_app_dir }}/supervisor"
-xqwatcher_supervisor_http_port: 9003
-xqwatcher_supervisor_data_dir: "{{ COMMON_DATA_DIR }}/{{ xqwatcher_service_name }}"
-xqwatcher_supervisor_log_dir: "{{ xqwatcher_log_dir }}"
-xqwatcher_supervisor_venv_dir: "{{ xqwatcher_venv_base }}/supervisor"
-xqwatcher_supervisor_user: "{{ xqwatcher_user }}"
-xqwatcher_supervisor_venv_bin: "{{ xqwatcher_supervisor_venv_dir }}/bin"
-xqwatcher_supervisor_ctl: "{{ xqwatcher_supervisor_venv_bin }}/supervisorctl"
-xqwatcher_supervisor_cfg_dir: "{{ xqwatcher_supervisor_app_dir }}/conf.d"
-xqwatcher_supervisor_available_dir: "{{ xqwatcher_supervisor_app_dir }}/conf.available.d"
-
 #
 # OS packages
 #

playbooks/roles/xqwatcher/meta/main.yml

@@ -14,6 +14,7 @@
 # random corners of ansible/jinga/python variable expansion.
 dependencies:
   - common
+  - role: supervisor
   - role: edx_service
     edx_service_name: "{{ xqwatcher_service_name }}"
     edx_service_repos: "{{ XQWATCHER_REPOS }}"
@@ -22,12 +23,3 @@ dependencies:
     edx_service_packages:
         debian: "{{ xqwatcher_debian_pkgs }}"
         redhat: "{{ xqwatcher_redhat_pkgs }}"
-  - role: supervisor
-    supervisor_app_dir: "{{ xqwatcher_supervisor_app_dir }}"
-    supervisor_data_dir: "{{ xqwatcher_supervisor_data_dir }}"
-    supervisor_log_dir: "{{ xqwatcher_supervisor_log_dir }}"
-    supervisor_venv_dir: "{{ xqwatcher_supervisor_venv_dir }}"
-    supervisor_service_user: "{{ xqwatcher_supervisor_user }}"
-    supervisor_available_dir: "{{ xqwatcher_supervisor_available_dir }}"
-    supervisor_service: "supervisor.xqwatcher"
-    supervisor_http_bind_port: "{{ xqwatcher_supervisor_http_port }}"

playbooks/roles/xqwatcher/tasks/deploy_watcher.yml

@@ -28,30 +28,20 @@
 - name: Write supervisord config
   template:
     src: "edx/app/supervisor/conf.d/xqwatcher.conf.j2"
-    dest: "{{ xqwatcher_supervisor_available_dir }}/xqwatcher.conf"
-    group: "{{ xqwatcher_user }}"
-    mode: "0650"
-  tags:
-    - install
-    - install:configuration
-
-- name: Enable supervisor script
-  file:
-    src: "{{ xqwatcher_supervisor_available_dir }}/xqwatcher.conf"
-    dest: "{{ xqwatcher_supervisor_cfg_dir }}/xqwatcher.conf"
-    state: link
-    force: yes
-  when: not disable_edx_services
+    dest: "{{ supervisor_available_dir }}/xqwatcher.conf"
+    owner: "{{ supervisor_user }}"
+    group: "{{ common_web_user }}"
+    mode: "0644"
   tags:
     - install
     - install:configuration
 
 - name: Update supervisor configuration
-  shell: "{{ xqwatcher_supervisor_ctl }} -c {{ xqwatcher_supervisor_app_dir }}/supervisord.conf update"
+  command: "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
   when: not disable_edx_services
   tags:
     - manage
-    - manage:update
+    - manage:start
 
 - name: Restart xqwatcher
   supervisorctl:

playbooks/roles/xqwatcher/templates/edx/app/supervisor/conf.d/xqwatcher.conf.j2

-;  {{ ansible_managed }}
-;
+#
+#  {{ ansible_managed }}
+#
 
 {% set xqwatcher_venv_dir = xqwatcher_app_dir + '/venvs/' + xqwatcher_service_name %}
 {% if COMMON_ENABLE_NEWRELIC_APP %}
@@ -11,10 +12,10 @@
 [program:{{ xqwatcher_service_name }}]
 command={{ executable }} -m {{ xqwatcher_module }} -d {{ xqwatcher_conf_dir }} 
 process_name=%(program_name)s
-user={{ xqwatcher_user }}
+user={{ common_web_user }}
 directory={{ xqwatcher_code_dir }}
-stdout_logfile={{ xqwatcher_supervisor_log_dir }}/%(program_name)s-stdout.log
-stderr_logfile={{ xqwatcher_supervisor_log_dir }}/%(program_name)s-stderr.log
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
 environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ XQWATCHER_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}
 killasgroup=true
 stopasgroup=true

playbooks/roles/xqwatcher/templates/etc/sudoers.d/95-xqwatcher.j2

-{{ xqwatcher_user }} ALL=({{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.user }})  SETENV:NOPASSWD:{{ xqwatcher_app_dir }}/venvs/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}/bin/python
-{{ xqwatcher_user }} ALL=({{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.user }}) NOPASSWD:/bin/kill
-{{ xqwatcher_user }} ALL=({{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.user }}) NOPASSWD:/usr/bin/pkill
+{{ common_web_user }} ALL=({{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.user }})  SETENV:NOPASSWD:{{ xqwatcher_app_dir }}/venvs/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}/bin/python
+{{ common_web_user }} ALL=({{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.user }}) NOPASSWD:/bin/kill
+{{ common_web_user }} ALL=({{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.user }}) NOPASSWD:/usr/bin/pkill