diff --git a/awx/settings/local_settings.py.docker_compose b/awx/settings/local_settings.py.docker_compose index 84592c21bd..86e6fea8d2 100644 --- a/awx/settings/local_settings.py.docker_compose +++ b/awx/settings/local_settings.py.docker_compose @@ -81,15 +81,15 @@ if is_testing(sys.argv): MONGO_DB = 'system_tracking_test' # Celery AMQP configuration. -CELERY_BROKER_URL = "amqp://{}:{}@{}/{}".format(os.environ.get("RABBITMQ_USER"), - os.environ.get("RABBITMQ_PASS"), - os.environ.get("RABBITMQ_HOST"), - urllib.quote(os.environ.get("RABBITMQ_VHOST", "/"), safe='')) +BROKER_URL = "amqp://{}:{}@{}/{}".format(os.environ.get("RABBITMQ_USER"), + os.environ.get("RABBITMQ_PASS"), + os.environ.get("RABBITMQ_HOST"), + urllib.quote(os.environ.get("RABBITMQ_VHOST", "/"), safe='')) CHANNEL_LAYERS = { 'default': {'BACKEND': 'asgi_amqp.AMQPChannelLayer', 'ROUTING': 'awx.main.routing.channel_routing', - 'CONFIG': {'url': CELERY_BROKER_URL}} + 'CONFIG': {'url': BROKER_URL}} } # Mongo host configuration diff --git a/installer/openshift/templates/configmap.yml.j2 b/installer/openshift/templates/configmap.yml.j2 index 8fb1e2b4bf..4f604c9b5c 100644 --- a/installer/openshift/templates/configmap.yml.j2 +++ b/installer/openshift/templates/configmap.yml.j2 @@ -78,7 +78,7 @@ data: 'PORT': "{{ pg_port }}", } } - CELERY_BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format( + BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format( "awx", "abcdefg", "localhost", @@ -87,7 +87,7 @@ data: CHANNEL_LAYERS = { 'default': {'BACKEND': 'asgi_amqp.AMQPChannelLayer', 'ROUTING': 'awx.main.routing.channel_routing', - 'CONFIG': {'url': CELERY_BROKER_URL}} + 'CONFIG': {'url': BROKER_URL}} } CACHES = { 'default': {