Merge pull request #3568 from edx/feanil/xqwatcher_supervisor

XQWatcher user doesn't have permissions to update supervisor or restart it.

playbooks/roles/xqwatcher/tasks/deploy.yml

@@ -7,6 +7,7 @@
     mode: "0600"
   when: XQWATCHER_GIT_IDENTITY != 'none'
   tags:
+    - deploy
     - install
     - install:code
     
@@ -19,6 +20,7 @@
     group: "{{ xqwatcher_user }}"
     mode: "0644" 
   tags:
+    - deploy
     - install
     - install:configuration
     
@@ -28,4 +30,4 @@
 
 - include: deploy_courses.yml
   tags:
-    - deploy-courses
\ No newline at end of file
+    - deploy-courses

playbooks/roles/xqwatcher/tasks/deploy_watcher.yml

@@ -50,7 +50,7 @@
     config: "{{ supervisor_cfg }}"
     state: restarted
   when: not disable_edx_services
-  become_user: "{{ xqwatcher_user }}"
+  become_user: "{{ common_web_user }}"
   tags:
     - manage
     - manage:update

playbooks/roles/xqwatcher/tasks/main.yml

@@ -115,5 +115,3 @@
 - include: code_jail.yml CODE_JAIL_COMPLAIN=false
 
 - include: deploy.yml
-  tags:
-    - deploy