External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-03 01:38:50 -03:30
Code Issues Packages Projects Releases Wiki Activity

Consistent naming scheme; memcached_host -> memcached_hostname

Browse Source 
environment.sh uses hostname for everything, and both environment and
credentials provide a default of 'memcached', so this should also be one less
variable to care about.
This commit is contained in:
Erik Berg
2019-11-18 15:22:12 +00:00
parent a1f7f967e3
commit f5fc0871fc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/roles/local_docker/defaults/main.yml
View File

@@ -16,6 +16,6 @@ postgresql_image: "postgres:{{postgresql_version}}"
memcached_image: "memcached" memcached_image: "memcached"
memcached_version: "alpine" memcached_version: "alpine"
memcached_host: "memcached" memcached_hostname: "memcached"
memcached_port: "11211" memcached_port: "11211"

2
installer/roles/local_docker/templates/credentials.py.j2
View File

@@ -26,7 +26,7 @@ CHANNEL_LAYERS = {
CACHES = { CACHES = {
'default': { 'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION': '{}:{}'.format("{{ memcached_host }}", "{{ memcached_port }}") 'LOCATION': '{}:{}'.format("{{ memcached_hostname }}", "{{ memcached_port }}")
}, },
'ephemeral': { 'ephemeral': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',