Several fixes to xqwatcher role

- Missing dictionary value of PYTHON_REQUIREMENTS
- Mispelling and boolification of aa-enforce/aa-complain mode
- Changed supervisord port to 9003 tro avoid conflict with devpi role
- Added course list to with_items of aa-enforce task
- Corrected data directory
- Corrected supervisord service name

playbooks/roles/xqwatcher/defaults/main.yml

@@ -19,6 +19,7 @@ XQWATCHER_COURSES:
   - COURSE: "exampleX-101x"
     GIT_REPO: "git@github.com:foo/graders-exampleX-101x.git"
     GIT_REF: "master"
+    PYTHON_REQUIREMENTS: []
     QUEUE_NAME: "exampleX-101x"
     QUEUE_CONFIG:
       SERVER: "https://xqueue.example.com"
@@ -35,6 +36,7 @@ XQWATCHER_COURSES:
   - COURSE: "exampleX-202x"
     GIT_REPO: "git@github.com:foo/graders-exampleX-202x.git"
     GIT_REF: "master"
+    PYTHON_REQUIREMENTS: []
     QUEUE_NAME: "exampleX-202x"
     QUEUE_CONFIG:
       SERVER: "https://xqueue.example.com"
@@ -73,7 +75,7 @@ xqwatcher_venv_base: "{{ xqwatcher_home }}/venvs"
 xqwatcher_venv_dir: "{{ xqwatcher_venv_base }}/{{ xqwatcher_service_name }}"
 xqwatcher_code_dir: "{{ xqwatcher_app_dir }}/src"
 xqwatcher_conf_dir: "{{ xqwatcher_home }}"
-xqwatcher_data_dir: "{{ xqwatcher_home }}/data"
+xqwatcher_data_dir: "{{ COMMON_DATA_DIR }}/{{ xqwatcher_service_name }}/data"
 
 xqwatcher_source_repo: "git@{{ COMMON_GIT_MIRROR }}:edx/xqueue-watcher.git"
 xqwatcher_git_ssh_opts: "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i {{ xqwatcher_git_identity }}"
@@ -87,6 +89,7 @@ xqwatcher_log_dir: "{{ COMMON_LOG_DIR }}/{{ 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"

playbooks/roles/xqwatcher/meta/main.yml

@@ -24,4 +24,4 @@ dependencies:
     supervisor_service_user: "{{ xqwatcher_supervisor_user }}"
     supervisor_available_dir: "{{ xqwatcher_supervisor_available_dir }}"
     supervisor_service: "supervisor.xqwatcher"
-    supervisor_http_bind_port: '9003'
+    supervisor_http_bind_port: "{{ xqwatcher_supervisor_http_port }}"

playbooks/roles/xqwatcher/tasks/code_jail.yml

@@ -74,9 +74,10 @@
 # environment where untrusted users can submit code
 - name: put code jail into aa-complain
   command: /usr/sbin/aa-complain "/etc/apparmor.d/code.jail.{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}"
-  when: CODE_JAIL_COMPLAIN
+  when: CODE_JAIL_COMPLAIN|bool
   with_items: XQWATCHER_COURSES
 
 - name: put code sandbox into aa-enforce
   command: /usr/sbin/aa-enforce "/etc/apparmor.d/code.jail.{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}"
-  when: CODE_JAIL_COMPAIN is not defined | not CODE_JAIL_COMPLAIN
\ No newline at end of file
+  when: not CODE_JAIL_COMPLAIN|bool
+  with_items: XQWATCHER_COURSES

playbooks/roles/xqwatcher/tasks/main.yml

@@ -48,6 +48,7 @@
 #   - COURSE: "exampleX-101x"
 #     GIT_REPO: "git@github.com:foo/graders-exampleX-101x.git"
 #     GIT_REF: "master"
+#     PYTHON_REQUIREMENTS: []
 #     QUEUE_NAME: "exampleX-101x"
 #     QUEUE_CONFIG:
 #       SERVER: "https://xqueue.example.com"
@@ -64,6 +65,7 @@
 #   - COURSE: "exampleX-202x"
 #     GIT_REPO: "git@github.com:foo/graders-exampleX-202x.git"
 #     GIT_REF: "master"
+#     PYTHON_REQUIREMENTS: []
 #     QUEUE_NAME: "exampleX-202x"
 #     QUEUE_CONFIG:
 #       SERVER: "https://xqueue.example.com"

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

@@ -7,7 +7,7 @@
 {% set executable = xqwatcher_venv_dir + '/bin/python' %}
 {% endif %}
 
-[program:xqwatcher_service_name]
+[program:{{ xqwatcher_service_name }}]
 command={{ executable }} -m {{ xqwatcher_module }} -d {{ xqwatcher_conf_dir }} 
 process_name=%(program_name)s
 user={{ xqwatcher_user }}