Remove redundant app_dir and replace data_dir with app_data

playbooks/roles/xqwatcher/defaults/main.yml

@@ -70,12 +70,11 @@ xqwatcher_user: "xqwatcher"
 xqwatcher_module: "xqueue_watcher"
 
 xqwatcher_app_dir: "{{ COMMON_APP_DIR }}/{{ xqwatcher_service_name }}"
-xqwatcher_home: "{{ COMMON_APP_DIR }}/{{ xqwatcher_service_name }}"
-xqwatcher_venv_base: "{{ xqwatcher_home }}/venvs"
+xqwatcher_app_data: "{{ xqwatcher_app_dir }}/data"
+xqwatcher_venv_base: "{{ xqwatcher_app_dir }}/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: "{{ COMMON_DATA_DIR }}/{{ xqwatcher_service_name }}/data"
+xqwatcher_conf_dir: "{{ xqwatcher_app_dir }}"
 
 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 }}"

playbooks/roles/xqwatcher/tasks/code_jail.yml

@@ -44,13 +44,13 @@
 - name: write out requirements.txt
   template: >
     src=edx/app/xqwatcher/data/requirements.txt.j2
-    dest={{ xqwatcher_data_dir }}/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}-requirements.txt
+    dest={{ xqwatcher_app_data }}/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}-requirements.txt
     mode=0440 owner=root group=root
   with_items: XQWATCHER_COURSES
 
 - name : install course specific python requirements
   pip: >
-    requirements="{{ xqwatcher_data_dir }}/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}-requirements.txt"
+    requirements="{{ xqwatcher_app_data }}/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}-requirements.txt"
     virtualenv="{{ xqwatcher_venv_base }}/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}"
     state=present
     extra_args="{{ XQWATCHER_PIP_EXTRA_ARGS }}"

playbooks/roles/xqwatcher/tasks/deploy_courses.yml

@@ -4,7 +4,7 @@
 
 - name: checkout grader code
   git: >
-    dest={{ xqwatcher_data_dir }}/{{ item.COURSE }} repo={{ item.GIT_REPO }}
+    dest={{ xqwatcher_app_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

@@ -86,8 +86,6 @@
 #   -----END RSA PRIVATE KEY-----
 #
 
-- include: code_jail.yml CODE_JAIL_COMPLAIN=false
-
 - name: create conf dir
   file: >
     path="{{ xqwatcher_conf_dir }}"
@@ -102,4 +100,13 @@
     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
+
 - include: deploy.yml tags=deploy