combine all the broker replacement pieces

* local redis for event processing
* postgres for message broker
* redis for websockets

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 = 'redis://localhost:6379'
 BROKER_TRANSPORT_OPTIONS = {}
 CELERY_DEFAULT_QUEUE = 'awx_private_queue'
 CELERYBEAT_SCHEDULE = {

awx/settings/local_settings.py.docker_compose

@@ -14,6 +14,7 @@
 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
@@ -53,12 +54,13 @@ if "pytest" in sys.modules:
 # 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": "awx.main.channels.RedisGroupBroadcastChannelLayer",
         "CONFIG": {
-            "hosts": [(os.environ.get('REDIS_HOST', 'redis_1'),
-                       int(os.environ.get('REDIS_PORT', 6379)))],
+            "hosts": [(redis_parts.hostname, redis_parts.port)]
         },
     },
 }