redis socket support

awx/settings/defaults.py

@@ -421,7 +421,7 @@ os.environ.setdefault('DJANGO_LIVE_TEST_SERVER_ADDRESS', 'localhost:9013-9199')
 
 BROKER_DURABILITY = True
 BROKER_POOL_LIMIT = None
-BROKER_URL = 'redis://localhost:6379'
+BROKER_URL = 'unix:///var/run/redis/redis.sock'
 BROKER_TRANSPORT_OPTIONS = {}
 CELERYBEAT_SCHEDULE = {
     'tower_scheduler': {
@@ -956,7 +956,7 @@ CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
-            "hosts": [("localhost", 6379)],
+            "hosts": [BROKER_URL],
             "capacity": 10000,
         },
     },

awx/settings/local_settings.py.docker_compose

@@ -12,9 +12,7 @@
 # MISC PROJECT SETTINGS
 ###############################################################################
 import os
-import urllib.parse
 import sys
-from urllib import parse
 
 # Enable the following lines and install the browser extension to use Django debug toolbar
 # if your deployment method is not VMWare of Docker-for-Mac you may
@@ -50,22 +48,6 @@ if "pytest" in sys.modules:
         }
     }
 
-# Use Redis as the message bus for now
-# Default to "just works" for single tower docker
-BROKER_URL = os.environ.get('BROKER_URL', "redis://redis_1:6379")
-
-redis_parts = parse.urlparse(BROKER_URL)
-
-CHANNEL_LAYERS = {
-    "default": {
-        "BACKEND": "channels_redis.core.RedisChannelLayer",
-        "CONFIG": {
-            "hosts": [(redis_parts.hostname, redis_parts.port)],
-            "capacity": 10000,
-        },
-    },
-}
-
 # Absolute filesystem path to the directory to host projects (with playbooks).
 # This directory should NOT be web-accessible.
 PROJECTS_ROOT = '/var/lib/awx/projects/'