sandbox-ora: Add SERVICE_VARIANT to xqueue to customize filenames

To be used in conjonction with
https://github.com/antoviaque/xqueue/commit/303601ea9ffcbd30f6bb3e2b9a42d6f85fbcf6b3

This is necessary to be able to get several services using the
`/opt/wwc/env.json` & `/opt/wwc/auth.json` files. The configuration
files would get overwitten when this is used by several different
services cohabiting on a single instance

playbooks/roles/xqueue/tasks/deploy.yml

@@ -52,7 +52,7 @@
   - deploy
 
 - name: xqueue | syncdb and migrate
-  shell: sudo -u www-data /opt/edx/bin/django-admin.py syncdb --migrate --noinput --settings=xqueue.aws_settings --pythonpath=/opt/wwc/xqueue
+  shell: sudo -u www-data SERVICE_VARIANT=xqueue /opt/edx/bin/django-admin.py syncdb --migrate --noinput --settings=xqueue.aws_settings --pythonpath=/opt/wwc/xqueue
   when: migrate_db is defined and migrate_db|lower == "yes"
   tags:
   - xqueue
@@ -60,7 +60,7 @@
   - deploy
 
 - name: xqueue | create users
-  shell: sudo -u www-data /opt/edx/bin/django-admin.py update_users --settings=xqueue.aws_settings --pythonpath=/opt/wwc/xqueue
+  shell: sudo -u www-data SERVICE_VARIANT=xqueue /opt/edx/bin/django-admin.py update_users --settings=xqueue.aws_settings --pythonpath=/opt/wwc/xqueue
   when: update_users is defined
   tags:
   - xqueue

playbooks/roles/xqueue/tasks/main.yml

@@ -32,7 +32,7 @@
     encoding=utf8
 
 - name: xqueue | create xqueue application config
-  template: src=xqueue.env.json.j2 dest={{app_base_dir}}/env.json mode=0640 owner=www-data group=adm
+  template: src=xqueue.env.json.j2 dest={{app_base_dir}}/xqueue.env.json mode=0640 owner=www-data group=adm
   notify:
   - xqueue | restart xqueue
   - xqueue | restart xqueue consumer
@@ -40,7 +40,7 @@
   - xqueue
 
 - name: xqueue | create xqueue auth file
-  template: src=xqueue.auth.json.j2 dest={{app_base_dir}}/auth.json mode=0640 owner=www-data group=adm
+  template: src=xqueue.auth.json.j2 dest={{app_base_dir}}/xqueue.auth.json mode=0640 owner=www-data group=adm
   notify:
   - xqueue | restart xqueue
   - xqueue | restart xqueue consumer

playbooks/roles/xqueue/templates/xqueue_consumer.conf.j2

@@ -11,6 +11,7 @@ respawn limit 3 30
 
 env LANG=en_US.UTF-8
 env WORKERS_PER_QUEUE={{xqueue_env_config.XQUEUE_WORKERS_PER_QUEUE}}
+env SERVICE_VARIANT="xqueue"
 chdir {{xqueue_code_dir}}
 setuid www-data