diff options
| -rw-r--r-- | awx/main/managers.py | 9 | ||||
| -rw-r--r-- | awx/settings/defaults.py | 4 | ||||
| -rw-r--r-- | awx/settings/development.py | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/awx/main/managers.py b/awx/main/managers.py index b7a7f6d908..f8afdca9e1 100644 --- a/awx/main/managers.py +++ b/awx/main/managers.py @@ -31,8 +31,13 @@ class InstanceManager(models.Manager): hostname='localhost', uuid='00000000-0000-0000-0000-000000000000') - # Return the appropriate record from the database. - return self.get(hostname=socket.gethostname()) + # If we can determine the instance we are on then return + # 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): # NOTE: TODO: Likely to repurpose this once standalone ramparts are a thing diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 4b6ce52b7a..31c8b3b8f3 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -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 diff --git a/awx/settings/development.py b/awx/settings/development.py index 2140d2a856..18072e6bc6 100644 --- a/awx/settings/development.py +++ b/awx/settings/development.py @@ -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 |