Merge pull request #1164 from edx/e0d/xqw-test

E0d/xqw test

playbooks/roles/xqwatcher/defaults/main.yml

@@ -10,6 +10,11 @@
 ##
 # Defaults for role xqwatcher
 #
+
+XQWATCHER_CONFIG:
+  HTTP_BASIC_AUTH: ['foo','bar']
+  POLL_TIME: 10
+
 XQWATCHER_COURSES:
   - COURSE: "exampleX-101x"
     GIT_REPO: "git@github.com:foo/graders-exampleX-101x.git"
@@ -63,12 +68,12 @@ xqwatcher_home: "{{ COMMON_APP_DIR }}/{{ xqwatcher_service_name }}"
 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 }}/conf.d"
+xqwatcher_conf_dir: "{{ xqwatcher_home }}"
 xqwatcher_data_dir: "{{ xqwatcher_home }}/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 }}"
-xqwatcher_version: "master"
+XQWATCHER_VERSION: "master"
 xqwatcher_git_identity: "{{ xqwatcher_app_dir }}/git-identity"
 
 xqwatcher_requirements_file: "{{ xqwatcher_code_dir }}/requirements.txt"

playbooks/roles/xqwatcher/tasks/deploy.yml

@@ -3,6 +3,12 @@
     content="{{ XQWATCHER_GIT_IDENTITY }}" dest={{ xqwatcher_git_identity }}
     owner={{ xqwatcher_user }} group={{ xqwatcher_user }} mode=0600
 
+- name: write out watcher config file
+  template: >
+    src=edx/app/xqwatcher/xqwatcher.json.j2
+    dest={{ xqwatcher_conf_dir }}/xqwatcher.json
+    mode=0644 owner={{ xqwatcher_user }} group={{ xqwatcher_user }}
+    
 - include: deploy_watcher.yml
   tags:
     - deploy-watcher

playbooks/roles/xqwatcher/tasks/deploy_watcher.yml

@@ -4,7 +4,7 @@
 
 - name: checkout watcher code
   git: >
-    dest={{ xqwatcher_code_dir }} repo={{ xqwatcher_source_repo }} version={{ xqwatcher_version }}
+    dest={{ xqwatcher_code_dir }} repo={{ xqwatcher_source_repo }} version={{ XQWATCHER_VERSION }}
     accept_hostkey=yes
     ssh_opts="{{ xqwatcher_git_ssh_opts }}"
 
@@ -18,7 +18,7 @@
 - name: write out course config files
   template: >
     src=edx/app/xqwatcher/conf.d/course.json.j2
-    dest={{ xqwatcher_conf_dir }}/{{ item.COURSE }}.json
+    dest={{ xqwatcher_conf_dir }}/conf.d/{{ item.COURSE }}.json
     mode=0644 owner={{ xqwatcher_user }} group={{ xqwatcher_user }}
   with_items: XQWATCHER_COURSES
 

playbooks/roles/xqwatcher/tasks/main.yml

@@ -103,11 +103,4 @@
     - "{{ xqwatcher_supervisor_data_dir }}"
     - "{{ xqwatcher_supervisor_log_dir }}"
 
-- name: write out course config files
-  template: >
-    src=edx/app/xqwatcher/conf.d/course.json.j2
-    dest={{ xqwatcher_conf_dir }}/{{ item.COURSE }}.json
-    mode=0644 owner={{ xqwatcher_user }} group={{ xqwatcher_user }}
-  with_items: XQWATCHER_COURSES
-
 - include: deploy.yml tags=deploy

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

 ;  {{ ansible_managed }}
 ;
 [program:xqwatcher]
-command={{ xqwatcher_venv_dir }}/bin/python -m {{ xqwatcher_module }} -d ../conf.d/
+command={{ xqwatcher_venv_dir }}/bin/python -m {{ xqwatcher_module }} -d {{ xqwatcher_conf_dir }}
 process_name=%(program_name)s
 directory={{ xqwatcher_code_dir }}
 stdout_logfile={{ xqwatcher_supervisor_log_dir }}/%(program_name)-stdout.log

playbooks/roles/xqwatcher/templates/edx/app/xqwatcher/xqwatcher.json.j2

+{{ XQWATCHER_CONFIG | to_nice_json }}
\ No newline at end of file