External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 18:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Switch to using callback queue by default

Browse Source 
* Fix an issue where we grab the wrong setting for the callback
  connection
* Remove old ansible.cfg that we shipped with the setup playbook for
  centos 6
This commit is contained in:
Matthew Jones
2016-11-21 13:25:47 -05:00
parent 6ce3a71f7d
commit c6ebdb9b26
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/queue.py
View File

@@ -48,7 +48,7 @@ class FifoQueue(object):
class CallbackQueueDispatcher(object): class CallbackQueueDispatcher(object):
def __init__(self): def __init__(self):
self.callback_connection = getattr(settings, 'CALLBACK_CONNECTION', None) self.callback_connection = getattr(settings, 'BROKER_URL', None)
self.connection_queue = getattr(settings, 'CALLBACK_QUEUE', '') self.connection_queue = getattr(settings, 'CALLBACK_QUEUE', '')
self.connection = None self.connection = None
self.exchange = None self.exchange = None

1
awx/settings/defaults.py
View File

@@ -796,6 +796,7 @@ ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC = False
# Internal API URL for use by inventory scripts and callback plugin. # Internal API URL for use by inventory scripts and callback plugin.
INTERNAL_API_URL = 'http://127.0.0.1:%s' % DEVSERVER_DEFAULT_PORT INTERNAL_API_URL = 'http://127.0.0.1:%s' % DEVSERVER_DEFAULT_PORT
USE_CALLBACK_QUEUE = True
CALLBACK_QUEUE = "callback_tasks" CALLBACK_QUEUE = "callback_tasks"
SCHEDULER_QUEUE = "scheduler" SCHEDULER_QUEUE = "scheduler"