xqwatcher fixes

playbooks/roles/xqwatcher/defaults/main.yml

@@ -77,9 +77,12 @@ 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
+#TODO: change this to /edx/etc after pulling xqwatcher.json out
 xqwatcher_conf_dir: "{{ xqwatcher_app_dir }}"
 
+#TODO: remove after refactoring out all the git stuff
+xqwatcher_course_git_ssh_opts: "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i {{ XQWATCHER_GIT_IDENTITY }}"
+
 xqwatcher_requirements_file: "{{ xqwatcher_code_dir }}/requirements.txt"
 xqwatcher_log_dir: "{{ COMMON_LOG_DIR }}/{{ xqwatcher_service_name }}"
 xqwatcher_module: "xqueue_watcher"

playbooks/roles/xqwatcher/tasks/deploy_courses.yml

@@ -6,5 +6,5 @@
   git: >
     dest={{ xqwatcher_app_dir }}/data/{{ item.COURSE }} repo={{ item.GIT_REPO }}
     version={{ item.GIT_REF }}
-    ssh_opts="{{ xqwatcher_git_ssh_opts }}"
+    ssh_opts="{{ xqwatcher_course_git_ssh_opts }}"
   with_items: XQWATCHER_COURSES

playbooks/roles/xqwatcher/tasks/deploy_watcher.yml

@@ -37,8 +37,8 @@
 - name: restart xqwatcher
   supervisorctl_local: >
     state=restarted
-    supervisorctl_path={{ supervisor_ctl }}
-    config={{ supervisor_cfg }}
+    supervisorctl_path={{ xqwatcher_supervisor_ctl }}
+    config={{ xqwatcher_supervisor_app_dir }}/supervisord.conf
     name={{ xqwatcher_service_name }}
   when: not disable_edx_services
-  sudo_user: "{{ supervisor_service_user }}"
\ No newline at end of file
+  sudo_user: "{{ xqwatcher_user }}"
\ No newline at end of file