Merge pull request #358 from edx/feanil/xqueue_xserver_fixes

Fixes to the xqueue and xserver roles.

playbooks/roles/nginx/templates/xqueue.j2

@@ -14,6 +14,10 @@ server {
     try_files $uri @proxy_to_app;
   }
 
+  # No basic auth security on the heartbeat url, so that ELB can use it
+  location /xqueue/status/{
+    try_files $uri @proxy_to_app;
+  }
 
 location @proxy_to_app {
     proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;

playbooks/roles/xqueue/defaults/main.yml

@@ -68,6 +68,8 @@ xqueue_auth_config:
       PASSWORD: $XQUEUE_MYSQL_PASSWORD
       HOST: $XQUEUE_MYSQL_HOST
       PORT: $XQUEUE_MYSQL_PORT
+  RABBITMQ_USER: $XQUEUE_RABBITMQ_USER
+  RABBITMQ_PASS: $XQUEUE_RABBITMQ_PASS
 
 xqueue_create_db: 'yes'
 xqueue_source_repo: https://github.com/edx/xqueue.git

playbooks/roles/xserver/defaults/main.yml

@@ -4,10 +4,10 @@
 XSERVER_NGINX_PORT: 18050
 XSERVER_BASIC_AUTH: False
 
-RABBIT_RUN_URL: ''
-RABBIT_GRADER_ROOT: ''
-RABBIT_LOGGING_ENV: 'sandbox'
-RABBIT_SYSLOG_SERVER: ''
+XSERVER_RUN_URL: ''
+XSERVER_GRADER_ROOT: ''
+XSERVER_LOGGING_ENV: 'sandbox'
+XSERVER_SYSLOG_SERVER: ''
 # by default do not check out the content
 # repo needed on the xserver for grading
 # python submissions, TODO: replace with an open
@@ -15,11 +15,11 @@ RABBIT_SYSLOG_SERVER: ''
 XSERVER_GRADER_CHECKOUT: False
 
 xserver_env_config:
-  RUN_URL: $RABBIT_RUN_URL
-  GRADER_ROOT: $RABBIT_GRADER_ROOT
-  LOGGING_ENV: $RABBIT_LOGGING_ENV
+  RUN_URL: $XSERVER_RUN_URL
+  GRADER_ROOT: $XSERVER_GRADER_ROOT
+  LOGGING_ENV: $XSERVER_LOGGING_ENV
   LOG_DIR: "{{ storage_base_dir }}/logs/xserver"
-  SYSLOG_SERVER: $RABBIT_SYSLOG_SERVER
+  SYSLOG_SERVER: $XSERVER_SYSLOG_SERVER
   SANDBOX_PYTHON: '/opt/edx_apparmor_sandbox/bin/python'
 
 xserver_git_identity_path: "{{ secure_dir }}/files/git-identity"
@@ -38,7 +38,7 @@ xserver_sandbox_venv_dir: "{{ venv_dir }}_apparmor_sandbox"
 xserver_requirements_file: "{{ xserver_code_dir }}/requirements.txt"
 
 xserver_gunicorn_port: 8050
-xserver_gunicorn_host: 8050
+xserver_gunicorn_host: 'localhost'
 
 xserver_debian_pkgs:
   - build-essential