External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 05:29:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Integrate memcached into setup playbook

Browse Source
This commit is contained in:
Matthew Jones
2016-09-01 11:41:20 -04:00
parent f0b7622672
commit f3b7fe18ce
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/settings/defaults.py
View File

@@ -351,7 +351,7 @@ CELERYBEAT_SCHEDULE = {
}, },
} }
# Use Redis as cache backend (except when testing). # Django Caching Configuration
if is_testing(): if is_testing():
CACHES = { CACHES = {
'default': { 'default': {
@@ -361,8 +361,8 @@ if is_testing():
else: else:
CACHES = { CACHES = {
'default': { 'default': {
'BACKEND': 'redis_cache.RedisCache', 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION': BROKER_URL, 'LOCATION': 'memcached:11211',
}, },
} }

15
awx/settings/local_settings.py.docker_compose
View File

@@ -48,21 +48,6 @@ if is_testing(sys.argv):
MONGO_DB = 'system_tracking_test' MONGO_DB = 'system_tracking_test'
# Django Caching Configuration
if is_testing():
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
},
}
else:
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION': 'memcached:11211',
},
}
# Celery AMQP configuration. # Celery AMQP configuration.
BROKER_URL = 'amqp://guest:guest@rabbitmq//' BROKER_URL = 'amqp://guest:guest@rabbitmq//'