External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 16:28:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Update configuration and playbook for rabbitmq

Browse Source 
* Purge remaining zeromq settings
* Make sure we have CALLBACK_QUEUE defined where needed
* Update setup playbook to not be tied to old ha primary/secondary concept
This commit is contained in:
Matthew Jones
2016-09-16 11:35:46 -04:00
parent bf3c68d8b4
commit d8ea0920c5
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/settings/defaults.py
View File

@@ -737,9 +737,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
# ZeroMQ callback settings. CALLBACK_QUEUE = "callback_tasks"
CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5556"
CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver.ipc"
TASK_COMMAND_PORT = 6559 TASK_COMMAND_PORT = 6559

5
awx/settings/development.py
View File

@@ -36,11 +36,6 @@ TEMPLATE_LOADERS = (
if 'celeryd' in sys.argv: if 'celeryd' in sys.argv:
SQL_DEBUG = False SQL_DEBUG = False
# Use a different callback consumer/queue for development, to avoid a conflict
# if there is also a nightly install running on the development machine.
CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5557"
CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver_dev.ipc"
CALLBACK_QUEUE = "callback_tasks" CALLBACK_QUEUE = "callback_tasks"
# Enable PROOT for tower-qa integration tests # Enable PROOT for tower-qa integration tests