refactoring

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

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