zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-06 00:11:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3509 from ansible/ha_installer

Browse Source 
Improvements to the setup/installer to support new HA workflows
This commit is contained in:
Matthew Jones
2016-09-16 15:53:38 -04:00
committed by GitHub
parent ba8290a94a a4ec0739ea
commit f3a8eb9daf
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/settings/defaults.py
View File

@@ -736,9 +736,7 @@ ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC = False
# Internal API URL for use by inventory scripts and callback plugin.
INTERNAL_API_URL = 'http://127.0.0.1:%s' % DEVSERVER_DEFAULT_PORT
# ZeroMQ callback settings.
CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5556"
CALLBACK_QUEUE_PORT = "ipc:///tmp/callback_receiver.ipc"
CALLBACK_QUEUE = "callback_tasks"
TASK_COMMAND_PORT = 6559

5
awx/settings/development.py
View File

@@ -36,11 +36,6 @@ TEMPLATE_LOADERS = (
if 'celeryd' in sys.argv:
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"
# Enable PROOT for tower-qa integration tests