From f5fc0871fc957e5921204bade51ecb8e06bf1c9e Mon Sep 17 00:00:00 2001 From: Erik Berg Date: Mon, 18 Nov 2019 15:22:12 +0000 Subject: [PATCH] Consistent naming scheme; memcached_host -> memcached_hostname 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. --- installer/roles/local_docker/defaults/main.yml | 2 +- installer/roles/local_docker/templates/credentials.py.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml index ede07f1f94..1da39b2b53 100644 --- a/installer/roles/local_docker/defaults/main.yml +++ b/installer/roles/local_docker/defaults/main.yml @@ -16,6 +16,6 @@ postgresql_image: "postgres:{{postgresql_version}}" memcached_image: "memcached" memcached_version: "alpine" -memcached_host: "memcached" +memcached_hostname: "memcached" memcached_port: "11211" diff --git a/installer/roles/local_docker/templates/credentials.py.j2 b/installer/roles/local_docker/templates/credentials.py.j2 index 7e8e4cbb0a..73951ca803 100644 --- a/installer/roles/local_docker/templates/credentials.py.j2 +++ b/installer/roles/local_docker/templates/credentials.py.j2 @@ -26,7 +26,7 @@ CHANNEL_LAYERS = { CACHES = { 'default': { 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION': '{}:{}'.format("{{ memcached_host }}", "{{ memcached_port }}") + 'LOCATION': '{}:{}'.format("{{ memcached_hostname }}", "{{ memcached_port }}") }, 'ephemeral': { 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',