External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-08 05:01:09 -02:30
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

9
awx/main/managers.py
View File

@@ -31,8 +31,13 @@ class InstanceManager(models.Manager):
hostname='localhost', hostname='localhost',
uuid='00000000-0000-0000-0000-000000000000') uuid='00000000-0000-0000-0000-000000000000')
# Return the appropriate record from the database. # If we can determine the instance we are on then return
return self.get(hostname=socket.gethostname()) # that, otherwise None which would be the standalone
# case
# TODO: Replace, this doesn't work if the hostname
# is different from the Instance.name
# node = self.filter(hostname=socket.gethostname())
return self.all()[0]
def my_role(self): def my_role(self):
# NOTE: TODO: Likely to repurpose this once standalone ramparts are a thing # NOTE: TODO: Likely to repurpose this once standalone ramparts are a thing

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 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