From 2e65741339539a48d430fecbb018c9009affb8c4 Mon Sep 17 00:00:00 2001 From: Kevin Falcone <kevin@edx.org> Date: Thu, 3 May 2018 13:55:58 -0400 Subject: [PATCH] Devstack and general environment improvements Make sure your config file is an environment variables. Remove several hardcoded settings files from the devstack commands. --- docker/build/xqueue/ansible_overrides.yml | 1 + playbooks/roles/xqueue/defaults/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/build/xqueue/ansible_overrides.yml b/docker/build/xqueue/ansible_overrides.yml index 98f10a7..366ad88 100644 --- a/docker/build/xqueue/ansible_overrides.yml +++ b/docker/build/xqueue/ansible_overrides.yml @@ -2,6 +2,7 @@ XQUEUE_SYSLOG_SERVER: "localhost" XQUEUE_RABBITMQ_HOSTNAME: "edx.devstack.rabbit" XQUEUE_MYSQL_HOST: "edx.devstack.mysql" +XQUEUE_SETTINGS: "devstack" xqueue_gunicorn_port: 18040 xqueue_gunicorn_host: 0.0.0.0 devstack: true diff --git a/playbooks/roles/xqueue/defaults/main.yml b/playbooks/roles/xqueue/defaults/main.yml index a712339..ea33f46 100644 --- a/playbooks/roles/xqueue/defaults/main.yml +++ b/playbooks/roles/xqueue/defaults/main.yml @@ -54,7 +54,6 @@ XQUEUE_MYSQL_CONN_MAX_AGE: 0 # This is Django's default https://docs.djangoproje XQUEUE_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-xqueue" XQUEUE_CONSUMER_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-xqueue_consumer" -XQUEUE_SETTINGS_MODULE: "xqueue.aws_settings" # Set the number of gunicorn front end workers explicitely for xqueue XQUEUE_WORKERS: !!null @@ -141,8 +140,9 @@ xqueue_gunicorn_port: 8040 xqueue_gunicorn_host: 127.0.0.1 xqueue_environment: - DJANGO_SETTINGS_MODULE: '{{ XQUEUE_SETTINGS_MODULE }}' + DJANGO_SETTINGS_MODULE: 'xqueue.{{ XQUEUE_SETTINGS }}' PATH: '{{ xqueue_venv_bin }}:{{ ansible_env.PATH }}' + XQUEUE_CFG: '{{ COMMON_CFG_DIR }}/xqueue.yml' xqueue_requirements_file: "{{ xqueue_code_dir }}/requirements.txt" xqueue_openstack_requirements_file: "{{ xqueue_code_dir }}/openstack-requirements.txt" -- libgit2 0.26.0