Merge pull request #914 from edx/jarv/updates-for-xqueue

Jarv/updates for xqueue

playbooks/edx-east/create_dbs.yml

@@ -84,6 +84,7 @@
         login_user: "{{ item.db_user }}"
         login_password: "{{ item.db_pass }}"
         host: '%'
+      when: item.db_user != 'None'
       with_items:
         - db_host: "{{ EDXAPP_MYSQL_HOST|default('None') }}"
           db_user: "{{ edxapp_db_root_user }}"
@@ -104,6 +105,7 @@
         login_user: "{{ item.db_user }}"
         login_password: "{{ item.db_pass }}"
         host: '%'
+      when: item.db_user != 'None'
       with_items:
         - db_host: "{{ EDXAPP_MYSQL_HOST|default('None') }}"
           db_user: "{{ edxapp_db_root_user }}"

playbooks/roles/xqueue/defaults/main.yml

@@ -2,21 +2,6 @@
 # when the role is included
 ---
 XQUEUE_NGINX_PORT: 18040
-
-xqueue_app_dir: "{{ COMMON_APP_DIR }}/xqueue"
-xqueue_code_dir: "{{ xqueue_app_dir }}/xqueue"
-xqueue_data_dir: "{{ COMMON_DATA_DIR }}/xqueue"
-xqueue_venvs_dir: "{{ xqueue_app_dir }}/venvs"
-xqueue_venv_dir: "{{ xqueue_venvs_dir }}/xqueue"
-xqueue_venv_bin: "{{ xqueue_venv_dir }}/bin"
-xqueue_user: "xqueue"
-
-# Default nginx listen port
-# These should be overrided if you want
-# to serve all content on port 80
-xqueue_gunicorn_port: 8040
-xqueue_gunicorn_host: 127.0.0.1
-
 XQUEUE_QUEUES:
   # push queue
   'edX-Open_DemoX': 'http://localhost:18050'
@@ -46,6 +31,23 @@ XQUEUE_MYSQL_PASSWORD: 'password'
 XQUEUE_MYSQL_HOST: 'localhost'
 XQUEUE_MYSQL_PORT: '3306'
 
+# Internal vars below this line
+#############################################
+
+xqueue_app_dir: "{{ COMMON_APP_DIR }}/xqueue"
+xqueue_code_dir: "{{ xqueue_app_dir }}/xqueue"
+xqueue_data_dir: "{{ COMMON_DATA_DIR }}/xqueue"
+xqueue_venvs_dir: "{{ xqueue_app_dir }}/venvs"
+xqueue_venv_dir: "{{ xqueue_venvs_dir }}/xqueue"
+xqueue_venv_bin: "{{ xqueue_venv_dir }}/bin"
+xqueue_user: "xqueue"
+
+# Default nginx listen port
+# These should be overrided if you want
+# to serve all content on port 80
+xqueue_gunicorn_port: 8040
+xqueue_gunicorn_host: 127.0.0.1
+
 xqueue_env_config:
   XQUEUES: $XQUEUE_QUEUES
   XQUEUE_WORKERS_PER_QUEUE: 12