From 799f321760f9aab07fff9c24c2fa45f1d686b3e9 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 12 Sep 2016 10:43:40 -0400 Subject: [PATCH] Fix an issue running jobs in the cluster The old VENV_PATH settings were still in place --- awx/settings/defaults.py | 1 + awx/settings/development.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 325536b535..8619d695c5 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -342,6 +342,7 @@ CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend' CELERY_QUEUES = ( Queue('default', Exchange('default'), routing_key='default'), Queue('jobs', Exchange('jobs'), routing_key='jobs'), + # Projects use a fanout queue, this isn't super well supported Broadcast('projects'), ) CELERY_ROUTES = ({'awx.main.tasks.run_job': {'queue': 'jobs', diff --git a/awx/settings/development.py b/awx/settings/development.py index 438c152a0a..4c727e0bdc 100644 --- a/awx/settings/development.py +++ b/awx/settings/development.py @@ -71,9 +71,9 @@ include(optional('/etc/tower/settings.py'), scope=locals()) include(optional('/etc/tower/conf.d/*.py'), scope=locals()) ANSIBLE_USE_VENV = True -ANSIBLE_VENV_PATH = "/tower_devel/venv/ansible" +ANSIBLE_VENV_PATH = "/venv/ansible" TOWER_USE_VENV = True -TOWER_VENV_PATH = "/tower_devel/venv/tower" +TOWER_VENV_PATH = "/venv/tower" # If any local_*.py files are present in awx/settings/, use them to override # default settings for development. If not present, we can still run using