Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove memcached dependency. #19

Merged
merged 1 commit into from
Jul 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
23 changes: 0 additions & 23 deletions templates/awx.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions templates/settings.py.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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'
},
}

Expand Down
1 change: 0 additions & 1 deletion vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"