switch memcached from tcp to unix domain socket

This commit is contained in:
chris meyers
2020-04-01 16:09:57 -04:00
parent 37a715c680
commit 7433aab258
13 changed files with 25 additions and 51 deletions

View File

@@ -91,15 +91,6 @@ data:
'ROUTING': 'awx.main.routing.channel_routing',
'CONFIG': {'url': BROKER_URL}}
}
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION': '{}:{}'.format("localhost", "11211")
},
'ephemeral': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
},
}
---
apiVersion: v1
kind: ConfigMap

View File

@@ -30,6 +30,7 @@ services:
volumes:
- "../:/awx_devel"
- "./redis/redis_socket_ha_1:/var/run/redis/"
- "./memcached/:/var/run/memcached"
ports:
- "5899-5999:5899-5999"
awx-2:
@@ -48,6 +49,7 @@ services:
volumes:
- "../:/awx_devel"
- "./redis/redis_socket_ha_2:/var/run/redis/"
- "./memcached/:/var/run/memcached"
ports:
- "7899-7999:7899-7999"
awx-3:
@@ -67,6 +69,7 @@ services:
volumes:
- "../:/awx_devel"
- "./redis/redis_socket_ha_3:/var/run/redis/"
- "./memcached/:/var/run/memcached"
ports:
- "8899-8999:8899-8999"
redis_1:
@@ -103,5 +106,9 @@ services:
image: postgres:10
container_name: tools_postgres_1
memcached:
user: ${CURRENT_UID}
image: memcached:alpine
container_name: tools_memcached_1
command: ["-s", "/var/run/memcached/memcached.sock", "-a", "0666"]
volumes:
- "./memcached/:/var/run/memcached"

View File

@@ -33,6 +33,7 @@ services:
- "../:/awx_devel"
- "../awx/projects/:/var/lib/awx/projects/"
- "./redis/redis_socket_standalone:/var/run/redis/"
- "./memcached/:/var/run/memcached"
privileged: true
# A useful container that simply passes through log messages to the console
# helpful for testing awx/tower logging
@@ -50,10 +51,12 @@ services:
environment:
POSTGRES_HOST_AUTH_METHOD: trust
memcached:
user: ${CURRENT_UID}
image: memcached:alpine
container_name: tools_memcached_1
ports:
- "11211:11211"
command: ["-s", "/var/run/memcached/memcached.sock", "-a", "0666"]
volumes:
- "./memcached/:/var/run/memcached"
redis:
image: redis:latest
container_name: tools_redis_1

View File

@@ -3,7 +3,6 @@ set +x
# Wait for the databases to come up
ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=postgres port=5432" all
ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=memcached port=11211" all
ansible -i "127.0.0.1," -c local -v -m wait_for -a "path=/var/run/redis/redis.sock" all
# In case AWX in the container wants to connect to itself, use "docker exec" to attach to the container otherwise