Merge pull request #1372 from chrismeyersfsu/old-celery3

celery 4.x to 3.x roll back

installer/image_build/files/supervisor_task.conf

@@ -3,7 +3,7 @@ nodaemon = True
 umask = 022
 
 [program:celery]
-command = /var/lib/awx/venv/awx/bin/celery worker -A awx -B -l debug --autoscale=4 -Ofair -s /var/lib/awx/beat.db -Q tower_broadcast_all -n celery@%(ENV_HOSTNAME)s
+command = /var/lib/awx/venv/awx/bin/celery worker -A awx -B -l debug --autoscale=4 -Ofair -s /var/lib/awx/beat.db -n celery@%(ENV_HOSTNAME)s
 directory = /var/lib/awx
 environment = LANGUAGE="en_US.UTF-8",LANG="en_US.UTF-8",LC_ALL="en_US.UTF-8",LC_CTYPE="en_US.UTF-8"
 #user = {{ aw_user }}

installer/inventory

@@ -8,6 +8,7 @@ localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env pyth
 # by default the base will be used to search for ansible/awx_web and ansible/awx_task
 dockerhub_base=ansible
 dockerhub_version=latest
+rabbitmq_version=3.6.14
 
 # This will create or update a default admin (superuser) account in AWX, if not provided
 # then these default values are used
@@ -93,4 +94,4 @@ pg_port=5432
 
 # AWX project data folder. If you need access to the location where AWX stores the projects
 # it manages from the docker host, you can set this to turn it into a volume for the container.
-#project_data_dir=/var/lib/awx/projects
+#project_data_dir=/var/lib/awx/projects

installer/openshift/templates/configmap.yml.j2

@@ -22,9 +22,6 @@ data:
     
     REMOTE_HOST_HEADERS = ['HTTP_X_FORWARDED_FOR']
 
-    CELERY_TASK_QUEUES += (Queue(CLUSTER_HOST_ID, Exchange(CLUSTER_HOST_ID), routing_key=CLUSTER_HOST_ID),)
-    CELERY_TASK_ROUTES['awx.main.tasks.cluster_node_heartbeat'] = {'queue': CLUSTER_HOST_ID, 'routing_key': CLUSTER_HOST_ID}
-    CELERY_TASK_ROUTES['awx.main.tasks.purge_old_stdout_files'] = {'queue': CLUSTER_HOST_ID, 'routing_key': CLUSTER_HOST_ID}
     STATIC_ROOT = '/var/lib/awx/public/static'
     PROJECTS_ROOT = '/var/lib/awx/projects'
     JOBOUTPUT_ROOT = '/var/lib/awx/job_status'
@@ -77,7 +74,7 @@ data:
             'PORT': "{{ pg_port }}",
         }
     }
-    CELERY_BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format(
+    BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format(
         "awx",
         "abcdefg",
         "localhost",
@@ -86,7 +83,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': {

installer/openshift/templates/deployment.yml.j2

@@ -33,7 +33,7 @@ spec:
             - name: DATABASE_HOST
               value: {{ pg_hostname|default('postgresql') }}
             - name: DATABASE_PORT
-              value: ({{ pg_port|default('5432') }})
+              value: "{{ pg_port|default('5432') }}"
             - name: DATABASE_PASSWORD
               value: {{ pg_password }}
             - name: MEMCACHED_HOST
@@ -45,7 +45,7 @@ spec:
             - name: AWX_ADMIN_PASSWORD
               value: {{ default_admin_password|default('password') }}
         - name: awx-rabbit
-          image: ansible/awx_rabbitmq:latest
+          image: ansible/awx_rabbitmq:{{ rabbitmq_version }}
           imagePullPolicy: Always
           env:
             # For consupmption by rabbitmq-env.conf