diff --git a/defaults/main.yml b/defaults/main.yml index 03369d8..84faa4e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,7 +12,6 @@ awx_postgres_version: 10 awx_awxweb_image: "{{ awx_awx_image | default('docker.io/ansible/awx:{}'.format(awx_awxweb_version)) }}" awx_awxtask_image: "{{ awx_awx_image | default('docker.io/ansible/awx:{}'.format(awx_awxtask_version)) }}" awx_postgres_image: docker.io/centos/postgresql-{{ awx_postgres_version }}-centos7 -awx_memcached_image: docker.io/library/memcached:alpine awx_redis_image: docker.io/library/redis:latest # Update postgresql from a lower version @@ -51,11 +50,6 @@ awx_pg_username: awx awx_pg_password: awxpass -awx_memcached_mem_request: 1 -awx_memcached_cpu_request: 500 -awx_memcached_socket_path: /var/run/memcached -awx_memcached_socket_filename: memcached.sock - awx_kubernetes_redis_config_mount_path: /usr/local/etc/redis/redis.conf # for settings file diff --git a/tasks/main.yml b/tasks/main.yml index d8c885c..8a4aa43 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -63,13 +63,6 @@ mode: '0777' owner: '999' - - name: ensure awx memcached-socket directory exists - file: - path: "{{ awx_podman_dir }}/memcached-socket" - state: directory - mode: '0777' - owner: '1000' - - name: ensure awx supervisor-socket directory exists file: path: "{{ awx_podman_dir }}/supervisor-socket" diff --git a/templates/awx.yml.j2 b/templates/awx.yml.j2 index 0c01fb0..9d43829 100644 --- a/templates/awx.yml.j2 +++ b/templates/awx.yml.j2 @@ -21,10 +21,6 @@ spec: hostPath: path: {{ awx_podman_dir }}/rsyslog-dir type: Directory - - name: memcached-socket - hostPath: - path: {{ awx_podman_dir }}/memcached-socket - type: Directory - name: awx-data-volume hostPath: path: {{ awx_podman_dir }}/data @@ -98,21 +94,6 @@ spec: - mountPath: /var/lib/pgsql/data:z name: db-volume # - # memcached container - # - - command: - - memcached - - -s - - {{ awx_memcached_socket_path }}/{{ awx_memcached_socket_filename }} - - -a - - 0666 - env: - image: {{ awx_memcached_image }} - name: {{ awx_pod_name }}_memcached - volumeMounts: - - name: memcached-socket - mountPath: "{{ awx_memcached_socket_path }}" - # # awx-web container # - command: @@ -170,8 +151,6 @@ spec: - mountPath: /etc/tower/conf.d/credentials.py:z name: credentials-py readOnly: true - - name: memcached-socket - mountPath: "{{ awx_memcached_socket_path }}" {% if awx_host_ssl_certificate is defined %} - mountPath: /etc/nginx/awxweb.pem:z name: ssl_certificate @@ -246,8 +225,6 @@ spec: - mountPath: /etc/tower/conf.d/credentials.py:z name: credentials-py readOnly: true - - name: memcached-socket - mountPath: "{{ awx_memcached_socket_path }}" {% if awx_host_ssl_certificate is defined %} - mountPath: /etc/nginx/awxweb.pem:z name: ssl_certificate diff --git a/templates/settings.py.j2 b/templates/settings.py.j2 index 974916a..a74006e 100644 --- a/templates/settings.py.j2 +++ b/templates/settings.py.j2 @@ -71,8 +71,8 @@ LOGGING['handlers']['management_playbooks'] = {'class': 'logging.NullHandler'} CACHES = { 'default': { - 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION': 'unix:/var/run/memcached/memcached.sock' + 'BACKEND': 'django_redis.cache.RedisCache', + 'LOCATION': 'unix:/var/run/redis/redis.sock' }, } diff --git a/vars/main.yml b/vars/main.yml index b51a12c..66c1e1d 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -9,7 +9,6 @@ awx_pod_label: "{{ awx_pod_name }}" awx_container_image_list: - "{{ awx_postgres_image }}" - - "{{ awx_memcached_image }}" - "{{ awx_redis_image }}" - "{{ awx_awxweb_image }}" - "{{ awx_awxtask_image }}"