Start/Stop all services using the edxapp role upstart script.

playbooks/roles/edxapp/handlers/main.yml

 ---
 # Restart Start all services.
-- name: restart lms
-  service: name=lms state=restarted
+- name: restart edxapp
+  service: name=edxapp state=restarted
   tags:
   - lms
-  - deploy
-
-- name: restart lms-xml
-  service: name=lms-xml state=restarted
-  tags:
   - lms-xml
-  - deploy
-
-- name: restart lms-preview
-  service: name=lms-preview state=restarted
-  tags:
   - lms-preview
-  - deploy
-
-- name: restart cms
-  service: name=cms state=restarted
-  tags:
   - cms
   - deploy

playbooks/roles/edxapp/tasks/deploy.yml

 # Stop all services.
-- name: stop lms service
-  service: name=lms state=stopped
+- name: stop edxapp services
+  service: name=edxapp state=stopped
   tags:
   - lms
-  - deploy
-
-- name: stop lms-xml service
-  service: name=lms-xml state=stopped
-  tags:
   - lms-xml
-  - deploy
-
-- name: stop lms-preview service
-  service: name=lms-preview state=stopped
-  tags:
   - lms-preview
-  - deploy
-
-- name: stop cms service
-  service: name=cms state=stopped
-  tags:
   - cms
   - deploy
 
-# Do the checkout.
-# Already done via the edxapp role.
-# TODO: Move it here.
 
 # Do Post Checkout Tasks.
 
@@ -79,9 +61,7 @@
   shell: executable=/bin/bash chdir={{ platform_code_dir }} SERVICE_VARIANT={{ lms_variant }} rake lms:gather_assets:aws
   when: grep_gather_assets.rc == 0
   notify:
-  - restart lms
-  - restart lms-xml
-  - restart lms-preview
+  - restart edxapp
   sudo: yes
   sudo_user: www-data
   environment: "{{ deploy_environment }}"
@@ -96,9 +76,7 @@
   shell: SERVICE_VARIANT={{ lms_variant }} django-admin.py collectstatic --pythonpath={{ platform_code_dir }} --settings=lms.envs.aws --noinput --verbosity=0
   when: grep_gather_assets.rc != 0 and check_lms_collect_static.rc == 0
   notify:
-  - restart lms
-  - restart lms-xml
-  - restart lms-preview
+  - restart edxapp
   sudo: yes
   sudo_user: www-data
   environment: "{{ deploy_environment }}"
@@ -115,7 +93,7 @@
   shell: executable=/bin/bash chdir={{ platform_code_dir }} SERVICE_VARIANT={{ cms_variant }} rake cms:gather_assets:aws
   when: grep_gather_assets.rc == 0
   notify:
-  - restart cms
+  - restart edxapp
   sudo: yes
   sudo_user: www-data
   environment: "{{ deploy_environment }}"
@@ -127,7 +105,7 @@
   shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py collectstatic --pythonpath={{ platform_code_dir }} --settings=lms.envs.aws --noinput --verbosity=0
   when: grep_gather_assets.rc != 0 and check_cms_collect_static.rc == 0
   notify:
-  - restart cms
+  - restart edxapp
   sudo: yes
   sudo_user: www-data
   environment: "{{ deploy_environment }}"
@@ -139,7 +117,7 @@
   shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py update_templates --pythonpath={{ platform_code_dir }} --settings=cms.envs.aws
   when: check_cms_update_templates.rc == 0
   notify:
-  - restart cms
+  - restart edxapp
   sudo: yes
   sudo_user: www-data
   environment: "{{ deploy_environment }}"