Move worker upstarts to their own files.

playbooks/roles/edxapp/tasks/cms.yml

@@ -32,4 +32,8 @@
   - update
 
 # Creates LMS upstart file
-- include: upstart.yml service_variant=cms
+- include: upstart.yml basename=cms
+  when: celery_worker is not defined
+
+- include: upstart.yml basename=edx-worker-cms
+  when: celery_worker is defined

playbooks/roles/edxapp/tasks/deploy.yml

 # Stop all services.
 - name: stop edxapp services
   service: name=edxapp state=stopped
+  when: celery_worker is not defined
   tags:
   - lms
   - lms-xml
@@ -10,6 +11,7 @@
 
 - name: stop edx workers
   service: name=edx-workers state=stopped
+  when: celery_worker is defined
   tags:
   - deploy
 

playbooks/roles/edxapp/tasks/lms-preview.yml

@@ -30,4 +30,4 @@
   when: celery_worker is not defined
 
 # Creates LMS Preview upstart file
-- include: upstart.yml service_variant=lms-preview
+- include: upstart.yml basename=lms-preview

playbooks/roles/edxapp/tasks/lms-xml.yml

@@ -32,4 +32,8 @@
   when: celery_worker is not defined
 
 # Creates upstart file
-- include: upstart.yml service_variant=lms-xml
+- include: upstart.yml basename=lms-xml
+  when: celery_worker is not defined
+
+- include: upstart.yml basename=edx-worker-lms-xml
+  when: celery_worker is defined

playbooks/roles/edxapp/tasks/lms.yml

@@ -28,4 +28,8 @@
   when: celery_worker is not defined
 
 # Creates LMS upstart file
-- include: upstart.yml service_variant=lms
+- include: upstart.yml basename=lms
+  when: celery_worker is not defined
+
+- include: upstart.yml basename=edx-worker-lms
+  when: celery_worker is defined

playbooks/roles/edxapp/tasks/upstart.yml

 # write the gunicorn upstart script for {{ service_variant }}
-- name: writing {{ service_variant }} upstart script to /etc/init
+- name: writing {{ basename }} upstart script to /etc/init
   sudo: True
-  template: src={{ service_variant }}.conf.j2 dest=/etc/init/{{ service_variant }}.conf owner=root group=root
+  template: src={{ basename }}.conf.j2 dest=/etc/init/{{ basename }}.conf owner=root group=root
   tags:
   - upstart
   - gunicorn

playbooks/roles/edxapp/templates/cms.conf.j2

 # gunicorn
 # Templated and placed by ansible from jinja2 source
-{% if celery_worker %}
-# CMS Celery Worker Upstart Script
-description "cms celery worker"
-
-stop on stopping edx-workers
-
-respawn
-
-instance edx.${SERVICE_VARIANT}.core.${QUEUE}
-
-#env NEW_RELIC_CONFIG_FILE=/opt/wwc/newrelic.ini
-#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-env CONCURRENCY=${CONCURRENCY}
-env LOGLEVEL=info
-env DJANGO_SETTINGS_MODULE=cms.envs.aws
-env PYTHONPATH={{edx_platform_code_dir}}
-env SERVICE_VARIANT=${SERVICE_VARIANT}
-
-setuid www-data
-
-chdir {{edx_platform_code_dir}}
-
-exec {{venv_dir}}/bin/django-admin.py celery worker --settings=$DJANGO_SETTINGS_MODULE --pythonpath=$PYTHONPATH --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY
-
-{% else %}
 description "cms gunicorn"
 # CMS Upstart Script
 start on started edxapp

playbooks/roles/edxapp/templates/edx-worker-cms.conf.j2

+# gunicorn
+# Templated and placed by ansible from jinja2 source
+# CMS Celery Worker Upstart Script
+description "cms celery worker"
+
+stop on stopping edx-workers
+
+respawn
+
+instance edx.${SERVICE_VARIANT}.core.${QUEUE}
+
+#env NEW_RELIC_CONFIG_FILE=/opt/wwc/newrelic.ini
+#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
+env CONCURRENCY=${CONCURRENCY}
+env LOGLEVEL=info
+env DJANGO_SETTINGS_MODULE=cms.envs.aws
+env PYTHONPATH={{edx_platform_code_dir}}
+env SERVICE_VARIANT=${SERVICE_VARIANT}
+
+setuid www-data
+
+chdir {{edx_platform_code_dir}}
+
+exec {{venv_dir}}/bin/django-admin.py celery worker --settings=$DJANGO_SETTINGS_MODULE --pythonpath=$PYTHONPATH --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY

playbooks/roles/edxapp/templates/edx-worker-lms-xml.conf.j2

+# gunicorn
+# Templated and placed by ansible from jinja2 source
+# lms-xml Celery Worker Upstart Script
+description "cms celery worker"
+
+stop on stopping edx-workers
+
+respawn
+
+instance edx.${SERVICE_VARIANT}.core.${QUEUE}
+
+#env NEW_RELIC_CONFIG_FILE=/opt/wwc/newrelic.ini
+#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
+env CONCURRENCY=${CONCURRENCY}
+env LOGLEVEL=info
+env DJANGO_SETTINGS_MODULE=lms.envs.aws
+env PYTHONPATH={{edx_platform_code_dir}}
+env SERVICE_VARIANT=${SERVICE_VARIANT}
+
+setuid www-data
+
+chdir {{edx_platform_code_dir}}
+
+exec {{venv_dir}}/bin/django-admin.py celery worker --settings=$DJANGO_SETTINGS_MODULE --pythonpath=$PYTHONPATH --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY

playbooks/roles/edxapp/templates/edx-worker-lms.conf.j2

+# gunicorn
+# Templated and placed by ansible from jinja2 source
+# CMS Celery Worker Upstart Script
+description "lms celery worker"
+
+stop on stopping edx-workers
+
+respawn
+
+instance edx.${SERVICE_VARIANT}.core.${QUEUE}
+
+#env NEW_RELIC_CONFIG_FILE=/opt/wwc/newrelic.ini
+#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
+env CONCURRENCY=${CONCURRENCY}
+env LOGLEVEL=info
+env DJANGO_SETTINGS_MODULE=lms.envs.aws
+env PYTHONPATH={{edx_platform_code_dir}}
+env SERVICE_VARIANT=${SERVICE_VARIANT}
+
+setuid www-data
+
+chdir {{edx_platform_code_dir}}
+
+exec {{venv_dir}}/bin/django-admin.py celery worker --settings=$DJANGO_SETTINGS_MODULE --pythonpath=$PYTHONPATH --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY

playbooks/roles/edxapp/templates/edx-workers.conf.j2

@@ -8,16 +8,16 @@ stop on runlevel [!2345]
 
 pre-start script
 
-   start cms QUEUE=low CONCURRENCY=1 SERVICE_VARIANT=cms
-   start cms QUEUE=default CONCURRENCY=3 SERVICE_VARIANT=cms
-   start cms QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=cms
+   start edx-worker-cms QUEUE=low CONCURRENCY=1 SERVICE_VARIANT=cms
+   start edx-worker-cms QUEUE=default CONCURRENCY=3 SERVICE_VARIANT=cms
+   start edx-worker-cms QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=cms
 
-   start lms QUEUE=low CONCURRENCY=1 SERVICE_VARIANT=lms
-   start lms QUEUE=default CONCURRENCY=3 SERVICE_VARIANT=lms
-   start lms QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=lms
+   start edx-worker-lms QUEUE=low CONCURRENCY=1 SERVICE_VARIANT=lms
+   start edx-worker-lms QUEUE=default CONCURRENCY=3 SERVICE_VARIANT=lms
+   start edx-worker-lms QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=lms
 
-   start lms-xml QUEUE=low CONCURRENCY=1 SERVICE_VARIANT=lms-xml
-   start lms-xml QUEUE=default CONCURRENCY=3 SERVICE_VARIANT=lms-xml
-   start lms-xml QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=lms-xml
+   start edx-worker-lms-xml QUEUE=low CONCURRENCY=1 SERVICE_VARIANT=lms-xml
+   start edx-worker-lms-xml QUEUE=default CONCURRENCY=3 SERVICE_VARIANT=lms-xml
+   start edx-worker-lms-xml QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=lms-xml
 
 end script

playbooks/roles/edxapp/templates/lms-xml.conf.j2

 # gunicorn
 # Templated and placed by ansible from jinja2 source
-{% if celery_worker %}
-# lms-xml Celery Worker Upstart Script
-description "cms celery worker"
-
-stop on stopping edx-workers
-
-respawn
-
-instance edx.${SERVICE_VARIANT}.core.${QUEUE}
-
-#env NEW_RELIC_CONFIG_FILE=/opt/wwc/newrelic.ini
-#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-env CONCURRENCY=${CONCURRENCY}
-env LOGLEVEL=info
-env DJANGO_SETTINGS_MODULE=lms.envs.aws
-env PYTHONPATH={{edx_platform_code_dir}}
-env SERVICE_VARIANT=${SERVICE_VARIANT}
-
-setuid www-data
-
-chdir {{edx_platform_code_dir}}
-
-exec {{venv_dir}}/bin/django-admin.py celery worker --settings=$DJANGO_SETTINGS_MODULE --pythonpath=$PYTHONPATH --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY
-
-{% else %}
-description "gunicorn server"
+description "lms-xml gunicorn server"
 
 start on started edxapp
 stop on stopped edxapp

playbooks/roles/edxapp/templates/lms.conf.j2

 # gunicorn
 # Templated and placed by ansible from jinja2 source
-{% if celery_worker %}
-# CMS Celery Worker Upstart Script
-description "lms celery worker"
-
-stop on stopping edx-workers
-
-respawn
-
-instance edx.${SERVICE_VARIANT}.core.${QUEUE}
-
-#env NEW_RELIC_CONFIG_FILE=/opt/wwc/newrelic.ini
-#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-env CONCURRENCY=${CONCURRENCY}
-env LOGLEVEL=info
-env DJANGO_SETTINGS_MODULE=lms.envs.aws
-env PYTHONPATH={{edx_platform_code_dir}}
-env SERVICE_VARIANT=${SERVICE_VARIANT}
-
-setuid www-data
-
-chdir {{edx_platform_code_dir}}
-
-exec {{venv_dir}}/bin/django-admin.py celery worker --settings=$DJANGO_SETTINGS_MODULE --pythonpath=$PYTHONPATH --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY
-
-{% else %}
 start on started edxapp
 stop on stopped edxapp