Skip to content

Commit e45fca8

Browse files
authored
Changed when clause to use vault_tls_disable & vault_tls_gossip as bool instead of int comparison (#359)
* cast vault_tls_disable and vault_tls_gossip to bool instead of doing integer comparison * changed default values to bools instead of ints --------- Co-authored-by: lakrass <[email protected]>
1 parent 381881a commit e45fca8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

defaults/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ vault_tls_certs_path: "{{ lookup('env', 'VAULT_TLS_DIR') | default(('/opt/vault/
295295
vault_tls_private_path: "{{ lookup('env', 'VAULT_TLS_DIR') | default(('/opt/vault/tls' if (vault_install_hashi_repo) else '/etc/vault/tls'), true) }}"
296296
vault_tls_src_files: "{{ lookup('env', 'VAULT_TLS_SRC_FILES') | default(role_path ~ '/files', true) }}"
297297

298-
vault_tls_disable: "{{ lookup('env', 'VAULT_TLS_DISABLE') | default(1, true) }}"
299-
vault_tls_gossip: "{{ lookup('env', 'VAULT_TLS_GOSSIP') | default(0, true) }}"
298+
vault_tls_disable: "{{ lookup('env', 'VAULT_TLS_DISABLE') | default(true, true) }}"
299+
vault_tls_gossip: "{{ lookup('env', 'VAULT_TLS_GOSSIP') | default(false, true) }}"
300300

301301
vault_tls_copy_keys: "{{ false if (vault_install_hashi_repo) else true }}"
302302
vault_protocol: "{% if vault_tls_disable %}http{% else %}https{% endif %}"

tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@
121121

122122
- name: TLS configuration
123123
include_tasks: ../tasks/tls.yml
124-
when: vault_tls_disable == 0
124+
when: not vault_tls_disable | bool
125125

126126
- name: Backend storage TLS configuration
127127
include_tasks: ../tasks/backend_tls.yml
128-
when: vault_tls_gossip == 1
128+
when: vault_tls_gossip | bool
129129

130130
- name: "Get content of GCP Credentials from file"
131131
set_fact:

0 commit comments

Comments
 (0)