supervisor-ora: Rename service names & config from `edx-ora` to `ora`

playbooks/roles/ora/handlers/main.yml

 ---
-- name: ora | restart edx-ora
-  service: name=edx-ora state=restarted
-- name: ora | restart edx-ora-celery
-  service: name=edx-ora-celery state=restarted
+- name: ora | restart ora
+  supervisorctl: >
+    name=ora
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    state=restarted
+
+- name: ora | restart ora_celery
+  supervisorctl: >
+    name=ora_celery
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    state=restarted

playbooks/roles/ora/tasks/deploy.yml

 
 - include: ease.yml
 
-- name: ora | See if edx-ora.conf is installed
-  shell: "[ -f /etc/init/edx-ora.conf ] && echo 'Found' || echo ''"
-  register: edx_ora_installed
+- name: ora | See if supervisord config file `ora.conf` is installed
+  shell: "[ -f {{ supervisor_cfg_dir }}/ora.conf ] && echo 'Found' || echo ''"
+  register: ora_installed
   tags:
   - deploy
 
-- name: ora | See if edx-ora-celery.conf is installed
-  shell: "[ -f /etc/init/edx-ora-celery.conf ] && echo 'Found' || echo ''"
-  register: edx_ora_celery_installed
+- name: ora | See if supervisord `ora_celery.conf` is installed
+  shell: "[ -f {{ supervisor_cfg_dir }}/ora_celery.conf ] && echo 'Found' || echo ''"
+  register: ora_celery_installed
   tags:
   - deploy
 
 # Stop ora service.
-- name: ora | stop edx-ora service
+- name: ora | stop ora service
   service: name=edx-ora state=stopped
-  when: edx_ora_installed.stdout == 'Found'
-  notify: ora | restart edx-ora
+  when: ora_installed.stdout == 'Found'
+  notify: ora | restart ora
   tags:
   - deploy
 
-- name: ora | stop edx-ora-celery service
-  service: name=edx-ora-celery state=stopped
-  when: edx_ora_celery_installed.stdout == 'Found'
-  notify: ora | restart edx-ora-celery
+- name: ora | stop ora_celery service
+  service: name=ora_celery state=stopped
+  when: ora_celery_installed.stdout == 'Found'
+  notify: ora | restart ora_celery
   tags:
   - deploy
 
@@ -41,12 +41,12 @@
   - deploy
 
 - name: ora | create ora upstart script
-  template: src=edx-ora.conf.j2 dest=/etc/init/edx-ora.conf
+  template: src=ora.conf.j2 dest=/etc/init/ora.conf
   tags:
   - deploy
 
-- name: ora | create ora-celery upstart script
-  template: src=edx-ora-celery.conf.j2 dest=/etc/init/edx-ora-celery.conf
+- name: ora | create ora_celery upstart script
+  template: src=ora_celery.conf.j2 dest=/etc/init/ora_celery.conf
   tags:
   - deploy
 
@@ -55,8 +55,8 @@
   git: dest={{ ora_code_dir }} repo={{ ora_source_repo }} version={{ ora_version }}
   sudo_user: "{{ ora_user }}"
   notify:
-    - ora | restart edx-ora
-    - ora | restart edx-ora-celery
+    - ora | restart ora
+    - ora | restart ora_celery
   tags:
   - deploy
 
@@ -69,8 +69,8 @@
   pip: requirements="{{ ora_pre_requirements_file }}" virtualenv="{{ ora_venv_dir }}" state=present
   sudo_user: "{{ ora_user }}"
   notify:
-    - ora | restart edx-ora
-    - ora | restart edx-ora-celery
+    - ora | restart ora
+    - ora | restart ora_celery
   tags:
   - deploy
 
@@ -79,8 +79,8 @@
   pip: requirements="{{ ora_post_requirements_file }}" virtualenv="{{ ora_venv_dir }}" state=present
   sudo_user: "{{ ora_user }}"
   notify:
-    - ora | restart edx-ora
-    - ora | restart edx-ora-celery
+    - ora | restart ora
+    - ora | restart ora_celery
   tags:
   - deploy
 
@@ -88,8 +88,8 @@
 - name: ora | change memory commit settings -- needed for redis
   command: sysctl vm.overcommit_memory=1
   notify:
-    - ora | restart edx-ora
-    - ora | restart edx-ora-celery
+    - ora | restart ora
+    - ora | restart ora_celery
   tags:
   - deploy
 
@@ -98,8 +98,8 @@
   when: migrate_db is defined and migrate_db|lower == "yes"
   sudo_user: "{{ ora_user }}"
   notify:
-    - ora | restart edx-ora
-    - ora | restart edx-ora-celery
+    - ora | restart ora
+    - ora | restart ora_celery
   tags:
   - deploy
 
@@ -107,7 +107,7 @@
   shell: SERVICE_VARIANT=ora {{ora_venv_dir}}/bin/django-admin.py update_users --settings=edx_ora.aws --pythonpath={{ora_code_dir}}
   sudo_user: "{{ ora_user }}"
   notify:
-    - ora | restart edx-ora
-    - ora | restart edx-ora-celery
+    - ora | restart ora
+    - ora | restart ora_celery
   tags:
   - deploy