Merge pull request #4361 from edx/jibsheet/xqueue_env

Add an xqueue_env file

playbooks/roles/xqueue/defaults/main.yml

@@ -54,6 +54,7 @@ XQUEUE_MYSQL_HOST: 'localhost'
 XQUEUE_MYSQL_PORT: '3306'
 XQUEUE_MYSQL_OPTIONS: {}
 XQUEUE_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-xqueue"
+XQUEUE_SETTINGS_MODULE: "xqueue.aws_settings"
 # Set the number of workers explicitely for xqueue
 XQUEUE_WORKERS: !!null
 XQUEUE_WORKERS_PER_QUEUE: 12
@@ -75,6 +76,11 @@ xqueue_user: "xqueue"
 xqueue_gunicorn_port: 8040
 xqueue_gunicorn_host: 127.0.0.1
 
+xqueue_environment:
+  DJANGO_SETTINGS_MODULE: '{{ XQUEUE_SETTINGS_MODULE }}'
+  PATH: '{{ xqueue_venv_bin }}:{{ ansible_env.PATH }}'
+
+
 xqueue_env_config:
   XQUEUES: "{{ XQUEUE_QUEUES }}"
   XQUEUE_WORKERS_PER_QUEUE: "{{ XQUEUE_WORKERS_PER_QUEUE }}"

playbooks/roles/xqueue/tasks/deploy.yml

@@ -44,6 +44,17 @@
     - install
     - install:configuration
 
+- name: setup the app env file
+  template:
+    src: "xqueue_env.j2"
+    dest: "{{ xqueue_app_dir }}/xqueue_env"
+    owner: "{{ xqueue_user }}"
+    group: "{{ common_web_group }}"
+    mode: 0644
+  tags:
+    - install
+    - install:configuration
+
 # Do A Checkout
 - name: "Git checkout xqueue repo into {{ xqueue_code_dir }}"
   git:
@@ -132,7 +143,7 @@
     - manage
     - manage:start
 
-- name: Create a symlink for venv python
+- name: Create a symlink for venv commands
   file:
     src: "{{ xqueue_venv_bin }}/{{ item }}"
     dest: "{{ COMMON_BIN_DIR }}/{{ item }}.xqueue"
@@ -144,6 +155,17 @@
     - install
     - install:app-requirements
 
+- name: Create symlinks for repo commands
+  file:
+    src: "{{ xqueue_code_dir }}/{{ item }}"
+    dest: "{{ COMMON_BIN_DIR }}/{{ item.split('.')[0] }}.xqueue"
+    state: link
+  with_items:
+    - manage.py
+  tags:
+    - install
+    - install:app-requirements
+
 - name: Restart xqueue
   supervisorctl:
     name: "{{ item }}"

playbooks/roles/xqueue/templates/xqueue_env.j2

+# {{ ansible_managed }}
+
+{% for name,value in xqueue_environment.items() -%}
+{%- if value -%}
+export {{ name }}="{{ value }}"
+{% endif %}
+{%- endfor %}