Merge pull request #1446 from matburt/fix_kubernetes_configmap

Apply celery rollback changes to kubernetes configmap

installer/kubernetes/templates/configmap.yml.j2

@@ -12,7 +12,8 @@ data:
     
     # Container environments don't like chroots
     AWX_PROOT_ENABLED = False
-    
+
+    # Automatically deprovision pods that go offline
     AWX_AUTO_DEPROVISION_INSTANCES = True
 
     #Autoprovisioning should replace this
@@ -21,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'
@@ -76,7 +74,7 @@ data:
             'PORT': "{{ pg_port }}",
         }
     }
-    CELERY_BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format(
+    BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format(
         "awx",
         "abcdefg",
         "localhost",
@@ -85,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/kubernetes/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
@@ -58,7 +58,7 @@ spec:
             - name: ERLANG_COOKIE
               value: "test"
             - name: RABBITMQ_ERLANG_COOKIE
-              value: "secretb"
+              value: "cookiemonster"
             - name: RABBITMQ_NODENAME
               value: "rabbit@$(MY_POD_IP)"
             - name: AUTOCLUSTER_TYPE
@@ -74,13 +74,13 @@ spec:
             - name: CLEANUP_INTERVAL
               value: "30"
             - name: RABBITMQ_DEFAULT_USER
-              value: awx
+              value: "awx"
             - name: RABBITMQ_DEFAULT_PASS
-              value: abcdefg
+              value: "abcdefg"
             - name: RABBITMQ_DEFAULT_VHOST
-              value: awx
+              value: "awx"
             - name: RABBITMQ_CONFIG_FILE
-              value: /etc/rabbitmq/rabbitmq
+              value: "/etc/rabbitmq/rabbitmq"
         - name: awx-memcached
           image: memcached
       volumes: