Set default CONSUL_TLS_DIR value — fixes 95

Author: brianshumate

CHANGELOG.md

@@ -699,7 +699,8 @@ Actually add new template files :facepalm:
 - Fix formatting in README_VAGRANT (thanks @jstoja)
 - Update CONTRIBUTORS
 
-## v1.25.1 (UNRELEASED)
+## v1.25.1
 
 - Support rolling upgrades on systemd based Linux (thanks oliverprater)
 - Fix breaking change in paths and runtime warnings (thanks oliverprater)
+- Set CONSUL_TLS_DIR default to `/etc/consul/ssl` for #95

defaults/main.yml

@@ -110,7 +110,9 @@ consul_acl_policy: false
 ## TLS
 consul_tls_enable: "{{ lookup('env','CONSUL_TLS_ENABLE') | default(false, true) }}"
 consul_tls_src_files: "{{ lookup('env','CONSUL_TLS_SRC_FILES') | default(role_path+'/files', true) }}"
-consul_tls_dir: "{{ lookup('env','CONSUL_TLS_DIR') | default({{ consul_config_path }}/ssl, true) }}"
+
+consul_tls_dir: "{{ lookup('env','CONSUL_TLS_DIR') | default('/etc/consul/ssl', true) }}"
+
 consul_tls_ca_crt: "{{ lookup('env','CONSUL_TLS_CA_CRT') | default('ca.crt', true) }}"
 consul_tls_server_crt: "{{ lookup('env','CONSUL_SERVER_CRT') | default('server.crt', true) }}"
 consul_server_key: "{{ lookup('env','CONSUL_SERVER_KEY') | default('server.key', true) }}"

version.txt

@@ -1 +1 @@
-v1.25.0
+v1.25.1