supervisor-ora: Move ora from upstart to supervisord

playbooks/roles/ora/defaults/main.yml

@@ -55,7 +55,7 @@ ORA_USERS:
 
 ORA_XQUEUE_URL: "http://localhost:18040"
 
-ORA_DJANGO_USERNAME: "lms"
+ORA_DJANGO_USER: "lms"
 ORA_DJANGO_PASSWORD: "password"
 ORA_URL: "http://localhost:18060"
 

playbooks/roles/ora/tasks/deploy.yml

@@ -13,14 +13,22 @@
 
 # Stop ora service.
 - name: ora | stop ora service
-  service: name=edx-ora state=stopped
+  supervisorctl: >
+    name=ora
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    state=stopped
   when: ora_installed.stdout == 'Found'
   notify: ora | restart ora
   tags:
   - deploy
 
 - name: ora | stop ora_celery service
-  service: name=ora_celery state=stopped
+  supervisorctl: >
+    name=ora_celery
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    state=stopped
   when: ora_celery_installed.stdout == 'Found'
   notify: ora | restart ora_celery
   tags:
@@ -40,15 +48,16 @@
   tags:
   - deploy
 
-- name: ora | create ora upstart script
-  template: src=ora.conf.j2 dest=/etc/init/ora.conf
+- name: ora | create supervisor scripts - ora, ora_celery
+  template: >
+    src={{ item }}.conf.j2 dest={{ supervisor_cfg_dir }}/{{ item }}.conf
+    owner={{ supervisor_user }} group={{ common_web_user }} mode=0644
+  with_items: ['ora', 'ora_celery']
   tags:
   - deploy
 
-- name: ora | create ora_celery upstart script
-  template: src=ora_celery.conf.j2 dest=/etc/init/ora_celery.conf
-  tags:
-  - deploy
+- name: ora | reload supervisor to allow to start the new services
+  shell: "{{ supervisor_ctl }} -c {{ supervisor_cfg }} reload"
 
 # Do A Checkout
 - name: ora | git checkout ora repo into {{ ora_app_dir }}

playbooks/roles/ora/templates/ora.conf.j2

-# /etc/init/edx-ora.conf
+[program:ora]
 
-description "edX ORA server"
-author "edx <info@edx.org>"
+command={{ ora_venv_bin }}/gunicorn --preload -b {{ ora_gunicorn_host }}:{{ ora_gunicorn_port }} -w {{ ora_gunicorn_workers }} --timeout=90 --pythonpath={{ ora_code_dir}} edx_ora.wsgi
 
-start on runlevel [2345]
-stop on runlevel [!2345]
+user={{ common_web_user }}
+directory={{ ora_code_dir }}
 
-respawn
-respawn limit 3 30
+# TODO: Make LANG a configuration variable
+environment=PID=/var/run/gunicorn/edx-ora.pid,WORKERS={{ ora_gunicorn_workers }},PORT={{ ora_gunicorn_port }},ADDRESS={{ ora_gunicorn_host }},LANG=en_US.UTF-8,DJANGO_SETTINGS_MODULE=edx_ora.aws,SERVICE_VARIANT=ora,NLTK_DATA={{ ora_nltk_data_dir }}
 
-env PID=/var/run/gunicorn/edx-ora.pid
-env WORKERS={{ ora_gunicorn_workers }}
-env PORT={{ ora_gunicorn_port }}
-env ADDRESS={{ ora_gunicorn_host }}
-env LANG=en_US.UTF-8
-env DJANGO_SETTINGS_MODULE=edx_ora.aws
-env SERVICE_VARIANT=ora
-env NLTK_DATA={{ ora_nltk_data_dir }}
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
 
-pre-start script
-end script
-
-chdir {{ ora_code_dir }}
-setuid {{ ora_user }}
-
-exec {{ ora_venv_dir}}/bin/gunicorn --preload -b $ADDRESS:$PORT -w $WORKERS --timeout=90 --pythonpath={{ ora_code_dir}} edx_ora.wsgi

playbooks/roles/ora/templates/ora_celery.conf.j2

-#Celery task for edx-ora
+[program:ora_celery]
 
-description "Celery grading controller"
-author "Vik Paruchuri <vik@edx.org>"
+command={{ ora_venv_bin }}/python {{ ora_code_dir }}/manage.py celeryd --loglevel=info --settings=edx_ora.aws --pythonpath={{ ora_code_dir }} -B --autoscale=4,1
 
-start on runlevel [2345]
-stop on runlevel [!2345]
+user={{ common_web_user }}
+directory={{ ora_code_dir }}
 
-respawn
-respawn limit 3 30
+environment=DJANGO_SETTINGS_MODULE=edx_ora.aws,SERVICE_VARIANT=ora
 
-env DJANGO_SETTINGS_MODULE=edx_ora.aws
-env SERVICE_VARIANT=ora
+stdout_logfile={{ supervisor_log_dir }}/%(program_name)-stdout.log
+stderr_logfile={{ supervisor_log_dir }}/%(program_name)-stderr.log
 
-chdir {{ ora_code_dir }}
-setuid {{ ora_user }}
-
-exec {{ ora_venv_dir }}/bin/python {{ ora_code_dir }}/manage.py celeryd --loglevel=info --settings=edx_ora.aws --pythonpath={{ ora_code_dir}} -B --autoscale=4,1