Merge pull request #1162 from edx/e0d/xqwatcher-fixes

E0d/xqwatcher fixes

playbooks/edx-east/xqwatcher.yml

+- name: Deploy xqueue-watcher
+  hosts: all
+  sudo: True
+  gather_facts: True
+  vars:
+    COMMON_APP_DIR: "/edx/app"
+    common_web_group: "www-data"
+    ENABLE_DATADOG: False
+    ENABLE_SPLUNKFORWARDER: False
+    ENABLE_NEWRELIC: False
+  roles:
+    - aws
+    - xqwatcher
+    - role: datadog
+      when: COMMON_ENABLE_DATADOG
+    - role: splunkforwarder
+      when: COMMON_ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: COMMON_ENABLE_NEWRELIC
\ No newline at end of file

playbooks/roles/xqwatcher/tasks/deploy.yml

@@ -6,12 +6,10 @@
 - include: deploy_watcher.yml
   tags:
     - deploy-watcher
-    - deploy
 
 - include: deploy_courses.yml
   tags:
     - deploy-courses
-    - deploy
 
 - name: remove read-only ssh key for the content repo
   file: path={{ xqwatcher_git_identity }} state=absent