Issue #42: Upgrade to latest versions of Tower and AWX, switch RabbitMQ to Redis.

README.md

@@ -61,8 +61,8 @@ If you would like to deploy AWX (the open source upstream of Tower) into your cl
     ---
     spec:
       ...
-      tower_task_image: ansible/awx_task:9.2.0
-      tower_web_image: ansible/awx_web:9.2.0
+      tower_task_image: ansible/awx_task:11.2.0
+      tower_web_image: ansible/awx_web:11.2.0
 
 ### Ingress Types
 
@@ -124,7 +124,7 @@ This environment is meant for headless testing (e.g. in a CI environment, or whe
 
 #### Testing in Minikube
 
-    minikube start --memory 6g --cpus 4
+    minikube start --memory 8g --cpus 4
     minikube addons enable ingress
     molecule test -s test-minikube
 

deploy/crds/tower_v1alpha1_tower_cr_awx.yaml

@@ -15,8 +15,8 @@ spec:
   tower_admin_email: test@example.com
   tower_admin_password: changeme
 
-  tower_task_image: ansible/awx_task:9.2.0
-  tower_web_image: ansible/awx_web:9.2.0
+  tower_task_image: ansible/awx_task:11.2.0
+  tower_web_image: ansible/awx_web:11.2.0
 
   tower_task_mem_request: 1Gi
   tower_task_cpu_request: 500m
@@ -28,7 +28,9 @@ spec:
 
   tower_memcached_image: memcached:alpine
 
-  tower_rabbitmq_image: rabbitmq:3
+  tower_redis_image: redis:latest
+  tower_redis_mem_request: 1Gi
+  tower_redis_cpu_request: 500m
 
   tower_postgres_pass: awxpass
   tower_postgres_image: postgres:10

deploy/crds/tower_v1alpha1_tower_cr_tower.yaml

@@ -15,8 +15,8 @@ spec:
   tower_admin_email: test@example.com
   tower_admin_password: changeme
 
-  tower_task_image: quay.io/ansible-tower/ansible-tower:3.6.4
-  tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.4
+  tower_task_image: registry.redhat.io/ansible-tower-37/ansible-tower-rhel7:3.7.0
+  tower_web_image: registry.redhat.io/ansible-tower-37/ansible-tower-rhel7:3.7.0
 
   tower_task_mem_request: 1Gi
   tower_task_cpu_request: 500m
@@ -28,7 +28,9 @@ spec:
 
   tower_memcached_image: memcached:alpine
 
-  tower_rabbitmq_image: rabbitmq:3
+  tower_redis_image: redis:latest
+  tower_redis_mem_request: 1Gi
+  tower_redis_cpu_request: 500m
 
   tower_postgres_pass: awxpass
   tower_postgres_image: postgres:10

molecule/test-minikube/converge.yml

@@ -34,7 +34,8 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     pull_policy: Never
     operator_image: tower.ansible.com/tower-operator:testing
-    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_tower.yaml'])) | from_yaml }}"
+    # Change this to _awx to test AWX, _tower to test Tower.
+    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_awx.yaml'])) | from_yaml }}"
 
   tasks:
     - block:

roles/tower/defaults/main.yml

@@ -10,12 +10,12 @@ tower_admin_email: test@example.com
 tower_admin_password: changeme
 
 # Use these image versions for Ansible Tower.
-tower_task_image: quay.io/ansible-tower/ansible-tower:3.6.4
-tower_web_image: quay.io/ansible-tower/ansible-tower:3.6.4
+tower_task_image: registry.redhat.io/ansible-tower-37/ansible-tower-rhel7:3.7.0
+tower_web_image: registry.redhat.io/ansible-tower-37/ansible-tower-rhel7:3.7.0
 
 # Use these image versions for Ansible AWX.
-# tower_task_image: ansible/awx_task:9.2.0
-# tower_web_image: ansible/awx_web:9.2.0
+# tower_task_image: ansible/awx_task:11.2.0
+# tower_web_image: ansible/awx_web:11.2.0
 
 tower_create_preload_data: true
 
@@ -29,7 +29,9 @@ tower_web_cpu_request: 1000m
 
 tower_memcached_image: memcached:alpine
 
-tower_rabbitmq_image: rabbitmq:3
+tower_redis_image: redis:latest
+tower_redis_mem_request: 1Gi
+tower_redis_cpu_request: 500m
 
 tower_postgres_pass: awxpass
 tower_postgres_image: postgres:10

roles/tower/tasks/main.yml

@@ -6,7 +6,7 @@
   with_items:
     - tower_memcached.yaml.j2
     - tower_postgres.yaml.j2
-    - tower_rabbitmq.yaml.j2
+    - tower_redis.yaml.j2
     - tower_config.yaml.j2
     - tower_web.yaml.j2
     - tower_task.yaml.j2

roles/tower/templates/tower_config.yaml.j2

@@ -16,8 +16,8 @@ data:
     DATABASE_PASSWORD={{ tower_postgres_pass | quote }}
     MEMCACHED_HOST='{{ meta.name }}-memcached.{{ meta.namespace }}.svc.cluster.local'
     MEMCACHED_PORT='11211'
-    RABBITMQ_HOST='{{ meta.name }}-rabbitmq.{{ meta.namespace }}.svc.cluster.local'
-    RABBITMQ_PORT='5672'
+    REDIS_HOST='{{ meta.name }}-redis.{{ meta.namespace }}.svc.cluster.local'
+    REDIS_PORT='6379'
     AWX_SKIP_MIGRATIONS=true
 
   settings: |
@@ -110,21 +110,23 @@ data:
         },
     }
     
-    BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format(
-        'guest',
-        'guest',
-        '{{ meta.name }}-rabbitmq.{{ meta.namespace }}.svc.cluster.local',
-        '5672',
-        'awx')
+    BROKER_URL = 'redis://{}:{}/'.format(
+        '{{ meta.name }}-redis.{{ meta.namespace }}.svc.cluster.local',
+        '6379',)
     
     CHANNEL_LAYERS = {
-        'default': {'BACKEND': 'asgi_amqp.AMQPChannelLayer',
-                    'ROUTING': 'awx.main.routing.channel_routing',
-                    'CONFIG': {'url': BROKER_URL}}
+        'default': {'BACKEND': 'awx.main.channels.RedisGroupBroadcastChannelLayer',
+                    'CONFIG': {'hosts': [("{{ meta.name }}-redis.{{ meta.namespace }}.svc.cluster.local", 6379)]}}
     }
     
     USE_X_FORWARDED_PORT = True
 
+  redis_conf: |
+    unixsocket /var/run/redis/redis.sock
+    unixsocketperm 777
+    port 0
+    bind 127.0.0.1
+
   nginx_conf: |
     worker_processes  1;
     pid        /tmp/nginx.pid;

roles/tower/templates/tower_rabbitmq.yaml.j2

@@ -1,48 +0,0 @@
-# RabbitMQ Deployment.
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: '{{ meta.name }}-rabbitmq'
-  namespace: '{{ meta.namespace }}'
-  labels:
-    app: tower-rabbitmq
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: tower-rabbitmq
-  template:
-    metadata:
-      labels:
-         app: tower-rabbitmq
-    spec:
-      containers:
-      - image: '{{ tower_rabbitmq_image }}'
-        name: rabbitmq
-        env:
-        - name: RABBITMQ_DEFAULT_VHOST
-          value: awx
-        - name: RABBITMQ_NODE_PORT
-          value: '5672'
-        ports:
-        - containerPort: 15672
-        - containerPort: 5672
-
-# RabbitMQ Service.
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: '{{ meta.name }}-rabbitmq'
-  namespace: '{{ meta.namespace }}'
-  labels:
-    app: tower-rabbitmq
-spec:
-  clusterIP: None
-  ports:
-  - port: 5672
-    protocol: TCP
-    targetPort: 5672
-  selector:
-    app: tower-rabbitmq

roles/tower/templates/tower_redis.yaml.j2

@@ -0,0 +1,63 @@
+# Redis Deployment.
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: '{{ meta.name }}-redis'
+  namespace: '{{ meta.namespace }}'
+  labels:
+    app: tower-redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: tower-redis
+  template:
+    metadata:
+      labels:
+         app: tower-redis
+    spec:
+      containers:
+      - image: '{{ tower_redis_image }}'
+        name: redis
+        args: ["/usr/local/etc/redis/redis.conf"]
+        ports:
+        - containerPort: 6379
+        volumeMounts:
+        - name: redis-config
+          mountPath: /usr/local/etc/redis/redis.conf
+          subPath: redis.conf
+          readOnly: true
+        - name: redis-socket
+          mountPath: "/var/run/redis"
+        resources:
+          requests:
+            memory: "{{ tower_redis_mem_request }}"
+            cpu: "{{ tower_redis_cpu_request }}"
+      volumes:
+      - name: redis-config
+        configMap:
+          name: "{{ meta.name }}-tower-configmap"
+          items:
+            - key: redis_conf
+              path: redis.conf
+      - name: redis-socket
+        emtpyDir: {}
+
+# Redis Service.
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: '{{ meta.name }}-redis'
+  namespace: '{{ meta.namespace }}'
+  labels:
+    app: tower-redis
+spec:
+  clusterIP: None
+  ports:
+  - port: 6379
+    protocol: TCP
+    targetPort: 6379
+  selector:
+    app: tower-redis