consolidating notifies

playbooks/roles/discern/handlers/main.yml

@@ -5,12 +5,7 @@
     supervisorctl_path={{ supervisor_ctl }}
     config={{ supervisor_cfg }}
     state=restarted
+  with_items:
+  - discern
+  - discern_celery
   tags: deploy
-
-- name: discern | restart discern_celery
-  supervisorctl: >
-    name=discern_celery
-    supervisorctl_path={{ supervisor_ctl }}
-    config={{ supervisor_cfg }}
-  tags: deploy
-    state=restarted

playbooks/roles/discern/tasks/deploy.yml

@@ -12,7 +12,6 @@
   template: src=env.json.j2 dest={{ discern_app_dir }}/env.json
   sudo_user: "{{ discern_user }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   tags:
     - deploy
@@ -21,7 +20,6 @@
   template: src=auth.json.j2 dest={{ discern_app_dir }}/auth.json
   sudo_user: "{{ discern_user }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   tags:
     - deploy
@@ -30,7 +28,6 @@
   git: dest={{ discern_code_dir }} repo={{ discern_source_repo }} version={{ discern_branch }}
   sudo_user: "{{ discern_user }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   tags:
     - deploy
@@ -39,7 +36,6 @@
   git: dest={{ discern_ease_code_dir}} repo={{ discern_ease_source_repo }} version={{ discern_ease_version }}
   sudo_user: "{{ discern_user }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   tags:
     - deploy
@@ -49,7 +45,6 @@
   pip: requirements={{item}} virtualenv={{ discern_venv_dir }} state=present
   sudo_user: "{{ discern_user }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   with_items:
     - "{{ discern_pre_requirements_file }}"
@@ -61,7 +56,6 @@
   pip: requirements={{item}} virtualenv={{ discern_venv_dir }} state=present
   sudo_user: "{{ discern_user }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   with_items:
     - "{{ discern_post_requirements_file }}"
@@ -73,7 +67,6 @@
   shell: >
     {{ discern_venv_dir }}/bin/activate; cd {{ discern_ease_code_dir }}; python setup.py install
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   tags:
     - deploy
@@ -84,7 +77,6 @@
     {{ discern_venv_dir }}/bin/python -m nltk.downloader -d {{ discern_nltk_data_dir }} all
   sudo_user: "{{ discern_user }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   tags:
     - deploy
@@ -97,7 +89,6 @@
       chdir={{ discern_code_dir }}
   sudo_user: "{{ discern_user }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   with_items:
     - syncdb
@@ -112,7 +103,6 @@
       chdir={{ discern_code_dir }}
   sudo_user: "{{ discern_user }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   tags:
     - deploy

playbooks/roles/discern/tasks/main.yml

@@ -6,7 +6,6 @@
     createhome=no
     shell=/bin/false
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
 
 - name: discern | create discern app dirs owned by discern
@@ -16,7 +15,6 @@
     owner="{{ discern_user }}"
     group="{{ common_web_group }}"
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   with_items:
     - "{{ discern_app_dir }}"
@@ -28,20 +26,17 @@
     owner="{{ common_web_user }}" group="{{ discern_user  }}"
     mode=0775
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
 
 - name: discern | install debian packages that discern needs
   apt: pkg={{ item }} state=present
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   with_items: discern_debian_pkgs
 
 - name: discern | install debian packages for ease that discern needs
   apt: pkg={{ item }} state=present
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
   with_items: discern_ease_debian_pkgs
 
@@ -50,14 +45,12 @@
     src=sudoers-discern dest=/etc/sudoers.d/discern
     mode=0440 validate='visudo -cf %s' owner=root group=root
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
 
 #Needed if using redis to prevent memory issues
 - name: discern | change memory commit settings -- needed for redis
   command: sysctl vm.overcommit_memory=1
   notify:
-    - discern | restart discern_celery
     - discern | restart discern
 
 - include: deploy.yml