mirror of
https://github.com/ansible/awx.git
synced 2026-02-01 01:28:09 -03:30
switch memcached from tcp to unix domain socket
This commit is contained in:
@@ -27,7 +27,6 @@ kubernetes_redis_image: "redis"
|
||||
kubernetes_redis_image_tag: "latest"
|
||||
kubernetes_redis_config_mount_path: "/usr/local/etc/redis/redis.conf"
|
||||
|
||||
memcached_hostname: localhost
|
||||
memcached_mem_request: 1
|
||||
memcached_cpu_request: 500
|
||||
|
||||
|
||||
@@ -192,16 +192,6 @@ data:
|
||||
LOGGING['handlers']['system_tracking_migrations'] = {'class': 'logging.NullHandler'}
|
||||
LOGGING['handlers']['management_playbooks'] = {'class': 'logging.NullHandler'}
|
||||
|
||||
CACHES = {
|
||||
'default': {
|
||||
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
|
||||
'LOCATION': 'unix:/var/run/memcached/memcached.sock'
|
||||
},
|
||||
'ephemeral': {
|
||||
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
|
||||
},
|
||||
}
|
||||
|
||||
USE_X_FORWARDED_PORT = True
|
||||
|
||||
AWX_CONTAINER_GROUP_DEFAULT_IMAGE = "{{ container_groups_image }}"
|
||||
|
||||
@@ -3,5 +3,3 @@ DATABASE_NAME={{ pg_database }}
|
||||
DATABASE_HOST={{ pg_hostname|default('postgresql') }}
|
||||
DATABASE_PORT={{ pg_port|default('5432') }}
|
||||
DATABASE_PASSWORD={{ pg_password | quote }}
|
||||
MEMCACHED_HOST={{ memcached_hostname|default('localhost') }}
|
||||
MEMCACHED_PORT={{ memcached_port|default('11211') }}
|
||||
|
||||
@@ -8,7 +8,5 @@ postgresql_image: "postgres:{{postgresql_version}}"
|
||||
|
||||
memcached_image: "memcached"
|
||||
memcached_version: "alpine"
|
||||
memcached_hostname: "memcached"
|
||||
memcached_port: "11211"
|
||||
|
||||
compose_start_containers: true
|
||||
|
||||
@@ -10,6 +10,12 @@
|
||||
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"
|
||||
|
||||
@@ -10,14 +10,4 @@ DATABASES = {
|
||||
}
|
||||
}
|
||||
|
||||
CACHES = {
|
||||
'default': {
|
||||
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
|
||||
'LOCATION': '{}:{}'.format("{{ memcached_hostname }}", "{{ memcached_port }}")
|
||||
},
|
||||
'ephemeral': {
|
||||
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
|
||||
},
|
||||
}
|
||||
|
||||
BROADCAST_WEBSOCKET_SECRET = "{{ broadcast_websocket_secret | b64encode }}"
|
||||
|
||||
@@ -25,6 +25,7 @@ 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 %}
|
||||
@@ -78,6 +79,7 @@ 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 %}
|
||||
@@ -125,15 +127,19 @@ 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:
|
||||
|
||||
@@ -6,7 +6,5 @@ DATABASE_PASSWORD={{ pg_password|default('awxpass')|quote }}
|
||||
{% if pg_admin_password is defined %}
|
||||
DATABASE_ADMIN_PASSWORD={{ pg_admin_password|quote }}
|
||||
{% endif %}
|
||||
MEMCACHED_HOST={{ memcached_hostname|default('memcached') }}
|
||||
MEMCACHED_PORT={{ memcached_port|default('11211')|quote }}
|
||||
AWX_ADMIN_USER={{ admin_user|quote }}
|
||||
AWX_ADMIN_PASSWORD={{ admin_password|quote }}
|
||||
|
||||
Reference in New Issue
Block a user