Refactor out xqwatcher_data_dir assumption

playbooks/roles/xqwatcher/defaults/main.yml

@@ -76,6 +76,8 @@ xqwatcher_user: "{{ xqwatcher_service_name }}"
 xqwatcher_app_dir: "{{ COMMON_APP_DIR }}/{{ xqwatcher_service_name }}"
 xqwatcher_app_data: "{{ xqwatcher_app_dir }}/data"
 xqwatcher_code_dir: "{{ xqwatcher_app_dir }}/src"
+
+#change this to /edx/etc after pulling xqwatcher.json out
 xqwatcher_conf_dir: "{{ xqwatcher_app_dir }}"
 
 xqwatcher_requirements_file: "{{ xqwatcher_code_dir }}/requirements.txt"

playbooks/roles/xqwatcher/tasks/code_jail.yml

@@ -37,7 +37,7 @@
 - name: write out requirements.txt
   template: >
     src=edx/app/xqwatcher/data/requirements.txt.j2
-    dest={{ xqwatcher_app_data }}/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}-requirements.txt
+    dest={{ xqwatcher_app_dir }}/data/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}-requirements.txt
     mode=0440 owner=root group=root
   with_items: XQWATCHER_COURSES
 

playbooks/roles/xqwatcher/tasks/deploy.yml

+#TODO: remove once xqwatcher.json can be pulled out into /edx/etc/
 - name: write out watcher config file
   template: >
     src=edx/app/xqwatcher/xqwatcher.json.j2

playbooks/roles/xqwatcher/tasks/deploy_courses.yml

@@ -4,7 +4,7 @@
 
 - name: checkout grader code
   git: >
-    dest={{ xqwatcher_app_data }}/{{ item.COURSE }} repo={{ item.GIT_REPO }}
+    dest={{ xqwatcher_app_dir }}/data/{{ item.COURSE }} repo={{ item.GIT_REPO }}
     version={{ item.GIT_REF }}
     ssh_opts="{{ xqwatcher_git_ssh_opts }}"
   with_items: XQWATCHER_COURSES

playbooks/roles/xqwatcher/tasks/main.yml

@@ -100,12 +100,6 @@
     owner="{{ xqwatcher_user }}"
     group="{{ xqwatcher_user }}"
 
-- name: create app data dir
-  file: >
-    path="{{ xqwatcher_app_data }}"
-    state=directory
-    owner="{{ xqwatcher_user }}"
-    group="{{ xqwatcher_user }}"
 
 - include: code_jail.yml CODE_JAIL_COMPLAIN=false