mirror of
https://github.com/ansible/awx.git
synced 2026-01-31 17:18:59 -03:30
remove memcache from everywhere and add djagno-redis to cover it
This commit is contained in:
@@ -27,12 +27,6 @@ kubernetes_redis_image: "redis"
|
||||
kubernetes_redis_image_tag: "latest"
|
||||
kubernetes_redis_config_mount_path: "/usr/local/etc/redis/redis.conf"
|
||||
|
||||
memcached_mem_request: 1
|
||||
memcached_cpu_request: 500
|
||||
|
||||
kubernetes_memcached_version: "latest"
|
||||
kubernetes_memcached_image: "memcached"
|
||||
|
||||
openshift_pg_emptydir: false
|
||||
openshift_pg_pvc_name: postgresql
|
||||
|
||||
|
||||
@@ -161,9 +161,6 @@ spec:
|
||||
- name: {{ kubernetes_deployment_name }}-redis-socket
|
||||
mountPath: "/var/run/redis"
|
||||
|
||||
- name: {{ kubernetes_deployment_name }}-memcached-socket
|
||||
mountPath: "/var/run/memcached"
|
||||
|
||||
resources:
|
||||
requests:
|
||||
memory: "{{ web_mem_request }}Gi"
|
||||
@@ -236,9 +233,6 @@ spec:
|
||||
|
||||
- name: {{ kubernetes_deployment_name }}-redis-socket
|
||||
mountPath: "/var/run/redis"
|
||||
|
||||
- name: {{ kubernetes_deployment_name }}-memcached-socket
|
||||
mountPath: "/var/run/memcached"
|
||||
env:
|
||||
- name: SUPERVISOR_WEB_CONFIG_PATH
|
||||
value: "/etc/supervisord.conf"
|
||||
@@ -293,31 +287,6 @@ spec:
|
||||
{% endif %}
|
||||
{% if redis_cpu_limit is defined %}
|
||||
cpu: "{{ redis_cpu_limit }}m"
|
||||
{% endif %}
|
||||
- name: {{ kubernetes_deployment_name }}-memcached
|
||||
image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}"
|
||||
imagePullPolicy: Always
|
||||
command:
|
||||
- 'memcached'
|
||||
- '-s'
|
||||
- '/var/run/memcached/memcached.sock'
|
||||
- '-a'
|
||||
- '0666'
|
||||
volumeMounts:
|
||||
- name: {{ kubernetes_deployment_name }}-memcached-socket
|
||||
mountPath: "/var/run/memcached"
|
||||
resources:
|
||||
requests:
|
||||
memory: "{{ memcached_mem_request }}Gi"
|
||||
cpu: "{{ memcached_cpu_request }}m"
|
||||
{% if memcached_mem_limit is defined or memcached_cpu_limit is defined %}
|
||||
limits:
|
||||
{% endif %}
|
||||
{% if memcached_mem_limit is defined %}
|
||||
memory: "{{ memcached_mem_limit }}Gi"
|
||||
{% endif %}
|
||||
{% if memcached_cpu_limit is defined %}
|
||||
cpu: "{{ memcached_cpu_limit }}m"
|
||||
{% endif %}
|
||||
{% if tolerations is defined %}
|
||||
tolerations:
|
||||
@@ -424,9 +393,6 @@ spec:
|
||||
- name: {{ kubernetes_deployment_name }}-redis-socket
|
||||
emptyDir: {}
|
||||
|
||||
- name: {{ kubernetes_deployment_name }}-memcached-socket
|
||||
emptyDir: {}
|
||||
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
|
||||
@@ -7,7 +7,4 @@ redis_image: "redis"
|
||||
postgresql_version: "10"
|
||||
postgresql_image: "postgres:{{postgresql_version}}"
|
||||
|
||||
memcached_image: "memcached"
|
||||
memcached_version: "alpine"
|
||||
|
||||
compose_start_containers: true
|
||||
|
||||
@@ -10,12 +10,6 @@
|
||||
state: directory
|
||||
mode: 0777
|
||||
|
||||
- name: Create Memcached socket directory
|
||||
file:
|
||||
path: "{{ docker_compose_dir }}/memcached_socket"
|
||||
state: directory
|
||||
mode: 0777
|
||||
|
||||
- name: Create Docker Compose Configuration
|
||||
template:
|
||||
src: "{{ item }}.j2"
|
||||
|
||||
@@ -7,7 +7,7 @@ services:
|
||||
container_name: awx_web
|
||||
depends_on:
|
||||
- redis
|
||||
- memcached
|
||||
- django-redis
|
||||
{% if pg_hostname is not defined %}
|
||||
- postgres
|
||||
{% endif %}
|
||||
@@ -32,7 +32,6 @@ services:
|
||||
- "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
|
||||
- "{{ docker_compose_dir }}/nginx.conf:/etc/nginx/nginx.conf:ro"
|
||||
- "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
|
||||
- "{{ docker_compose_dir }}/memcached_socket:/var/run/memcached/:rw"
|
||||
{% if project_data_dir is defined %}
|
||||
- "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
|
||||
{% endif %}
|
||||
@@ -76,7 +75,6 @@ services:
|
||||
container_name: awx_task
|
||||
depends_on:
|
||||
- redis
|
||||
- memcached
|
||||
- web
|
||||
{% if pg_hostname is not defined %}
|
||||
- postgres
|
||||
@@ -93,7 +91,6 @@ services:
|
||||
- "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh"
|
||||
- "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py"
|
||||
- "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
|
||||
- "{{ docker_compose_dir }}/memcached_socket:/var/run/memcached/:rw"
|
||||
{% if project_data_dir is defined %}
|
||||
- "{{ project_data_dir +':/var/lib/awx/projects:rw' }}"
|
||||
{% endif %}
|
||||
@@ -142,19 +139,6 @@ services:
|
||||
volumes:
|
||||
- "{{ docker_compose_dir }}/redis.conf:/usr/local/etc/redis/redis.conf:ro"
|
||||
- "{{ docker_compose_dir }}/redis_socket:/var/run/redis/:rw"
|
||||
- "{{ docker_compose_dir }}/memcached_socket:/var/run/memcached/:rw"
|
||||
|
||||
memcached:
|
||||
image: "{{ memcached_image }}:{{ memcached_version }}"
|
||||
container_name: awx_memcached
|
||||
command: ["-s", "/var/run/memcached/memcached.sock", "-a", "0666"]
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
http_proxy: {{ http_proxy | default('') }}
|
||||
https_proxy: {{ https_proxy | default('') }}
|
||||
no_proxy: {{ no_proxy | default('') }}
|
||||
volumes:
|
||||
- "{{ docker_compose_dir }}/memcached_socket:/var/run/memcached/:rw"
|
||||
|
||||
{% if pg_hostname is not defined %}
|
||||
postgres:
|
||||
|
||||
Reference in New Issue
Block a user