From fe05b4c0d5bb88b71fe10d068af3ffb504ce8b1e Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Tue, 27 Feb 2018 11:21:58 -0500
Subject: [PATCH] use celery 3.x BROKER_URL

* Celery 4.x specifies the broker via CELERY_BROKER_URL. Since we are
now on 3.x, use 3.x way of specifying the broker via BROKER_URL
---
 awx/settings/local_settings.py.docker_compose  | 10 +++++-----
 installer/openshift/templates/configmap.yml.j2 |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

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': {