Skip to content

Commit ee75219

Browse files
saltydksaltydk
committed
inventory: explicitly typecast booleans
1 parent 863ba29 commit ee75219

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎inventories/group_vars/all.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ rclone_old_remote_is_defined: "{{ (rclone is defined) and
8686

8787
use_cloudplow: "{{ rclone_remote_is_defined and use_remote }}"
8888

89-
use_remote: "{{ rclone.enabled and not continuous_integration }}"
89+
use_remote: "{{ (rclone.enabled | bool) and not continuous_integration }}"
9090

9191
use_nvidia: "{{ gpu.nvidia | bool }}"
9292

@@ -188,16 +188,16 @@ traefik_role_var: "{{ lookup('vars', role_name + '_name', default=role_name) | r
188188
# Replaces powerdns with pdns for config sanity reasons.
189189
traefik_challenge_provider: "{{ traefik.provider | default('cloudflare') | replace('powerdns', 'pdns') }}"
190190
traefik_default_certprovider: "{{ 'cfdns'
191-
if (not traefik.cert.zerossl)
191+
if (not (traefik.cert.zerossl | bool))
192192
else 'zerossl' }}"
193193
traefik_default_zerossl_resolver: "zerosslhttp"
194194
traefik_default_resolver: "httpresolver"
195195
traefik_default_certresolver: "{{ traefik_default_certprovider
196-
if (not traefik_http)
196+
if (not (traefik_http | bool))
197197
else (traefik_default_resolver if not zerossl_is_enabled else traefik_default_zerossl_resolver) }}"
198198

199-
traefik_error_pages_enabled: "{{ traefik.error_pages }}"
200-
traefik_error_pages_role_enabled: "{{ lookup('vars', traefik_role_var + '_traefik_error_pages_enabled', default=lookup('vars', role_name + '_traefik_error_pages_enabled', default=false)) }}"
199+
traefik_error_pages_enabled: "{{ traefik.error_pages | bool }}"
200+
traefik_error_pages_role_enabled: "{{ lookup('vars', traefik_role_var + '_traefik_error_pages_enabled', default=lookup('vars', role_name + '_traefik_error_pages_enabled', default=false)) | bool }}"
201201
traefik_error_pages_middleware: "{{ 'error-pages-middleware,'
202202
if traefik_error_pages_enabled and traefik_error_pages_role_enabled
203203
else '' }}"
@@ -208,13 +208,13 @@ traefik_default_autodetect: false
208208
traefik_default_middleware_default: "{{ traefik_error_pages_middleware
209209
+ 'globalHeaders@file,secureHeaders@file'
210210
+ (',autodetect'
211-
if (lookup('vars', traefik_role_var + '_traefik_autodetect_enabled', default=lookup('vars', role_name + '_traefik_autodetect_enabled', default=traefik_default_autodetect)))
211+
if (lookup('vars', traefik_role_var + '_traefik_autodetect_enabled', default=lookup('vars', role_name + '_traefik_autodetect_enabled', default=traefik_default_autodetect)) | bool)
212212
else '')
213213
+ (',gzip'
214-
if (lookup('vars', traefik_role_var + '_traefik_gzip_enabled', default=lookup('vars', role_name + '_traefik_gzip_enabled', default=traefik_default_gzip)))
214+
if (lookup('vars', traefik_role_var + '_traefik_gzip_enabled', default=lookup('vars', role_name + '_traefik_gzip_enabled', default=traefik_default_gzip)) | bool)
215215
else '')
216216
+ (',hsts@file'
217-
if (traefik.hsts)
217+
if (traefik.hsts | bool)
218218
else '')
219219
+ (',cloudflarewarp'
220220
if (cloudflare_is_enabled)
@@ -244,10 +244,10 @@ traefik_default_middleware_http: "{{ traefik_default_middleware_default_http
244244
if (not traefik_default_middleware_custom_http.startswith(',') and traefik_default_middleware_custom_http | length > 0)
245245
else traefik_default_middleware_custom_http)
246246
+ (',autodetect'
247-
if (lookup('vars', traefik_role_var + '_traefik_autodetect_enabled', default=lookup('vars', role_name + '_traefik_autodetect_enabled', default=traefik_default_autodetect)))
247+
if (lookup('vars', traefik_role_var + '_traefik_autodetect_enabled', default=lookup('vars', role_name + '_traefik_autodetect_enabled', default=traefik_default_autodetect)) | bool)
248248
else '')
249249
+ (',gzip'
250-
if (lookup('vars', traefik_role_var + '_traefik_gzip_enabled', default=lookup('vars', role_name + '_traefik_gzip_enabled', default=traefik_default_gzip)))
250+
if (lookup('vars', traefik_role_var + '_traefik_gzip_enabled', default=lookup('vars', role_name + '_traefik_gzip_enabled', default=traefik_default_gzip)) | bool)
251251
else '')
252252
+ (',cloudflarewarp'
253253
if (cloudflare_is_enabled)
@@ -263,21 +263,21 @@ traefik_default_middleware_http_api: "{{ traefik_default_middleware_default_http
263263
if (not traefik_default_middleware_custom_http_api.startswith(',') and traefik_default_middleware_custom_http_api | length > 0)
264264
else traefik_default_middleware_custom_http_api)
265265
+ (',autodetect'
266-
if (lookup('vars', traefik_role_var + '_traefik_autodetect_enabled', default=lookup('vars', role_name + '_traefik_autodetect_enabled', default=traefik_default_autodetect)))
266+
if (lookup('vars', traefik_role_var + '_traefik_autodetect_enabled', default=lookup('vars', role_name + '_traefik_autodetect_enabled', default=traefik_default_autodetect)) | bool)
267267
else '')
268268
+ (',gzip'
269-
if (lookup('vars', traefik_role_var + '_traefik_gzip_enabled', default=lookup('vars', role_name + '_traefik_gzip_enabled', default=traefik_default_gzip)))
269+
if (lookup('vars', traefik_role_var + '_traefik_gzip_enabled', default=lookup('vars', role_name + '_traefik_gzip_enabled', default=traefik_default_gzip)) | bool)
270270
else '')
271271
+ (',cloudflarewarp'
272272
if (cloudflare_is_enabled)
273273
else '') }}"
274274

275275
traefik_default_middleware_default_api: "{{ 'globalHeaders@file,secureHeaders@file'
276276
+ (',autodetect'
277-
if (lookup('vars', traefik_role_var + '_traefik_autodetect_enabled', default=lookup('vars', role_name + '_traefik_autodetect_enabled', default=traefik_default_autodetect)))
277+
if (lookup('vars', traefik_role_var + '_traefik_autodetect_enabled', default=lookup('vars', role_name + '_traefik_autodetect_enabled', default=traefik_default_autodetect)) | bool)
278278
else '')
279279
+ (',gzip'
280-
if (lookup('vars', traefik_role_var + '_traefik_gzip_enabled', default=lookup('vars', role_name + '_traefik_gzip_enabled', default=traefik_default_gzip)))
280+
if (lookup('vars', traefik_role_var + '_traefik_gzip_enabled', default=lookup('vars', role_name + '_traefik_gzip_enabled', default=traefik_default_gzip)) | bool)
281281
else '')
282282
+ (',hsts@file'
283283
if (traefik.hsts)
@@ -293,8 +293,8 @@ traefik_default_middleware_api: "{{ traefik_default_middleware_default_api
293293

294294
traefik_default_sso_middleware: "authelia"
295295

296-
traefik_role_enabled: "{{ lookup('vars', traefik_role_var + '_traefik_enabled', default=lookup('vars', role_name + '_traefik_enabled', default=false)) }}"
297-
traefik_role_api_enabled: "{{ lookup('vars', traefik_role_var + '_traefik_api_enabled', default=lookup('vars', role_name + '_traefik_api_enabled', default=false)) }}"
296+
traefik_role_enabled: "{{ lookup('vars', traefik_role_var + '_traefik_enabled', default=lookup('vars', role_name + '_traefik_enabled', default=false)) | bool }}"
297+
traefik_role_api_enabled: "{{ lookup('vars', traefik_role_var + '_traefik_api_enabled', default=lookup('vars', role_name + '_traefik_api_enabled', default=false)) | bool }}"
298298

299299
traefik_http: "{{ false
300300
if ((traefik_challenge_provider != 'cloudflare') or cloudflare_is_enabled)
@@ -316,9 +316,9 @@ traefik_host_template: "{{ lookup('vars', traefik_role_var + '_web_host_override
316316
if traefik_host_override
317317
else 'Host(`' + traefik_host + '`)' }}"
318318

319-
traefik_entrypoint_web_default: "{{ 'web' if not lookup('vars', traefik_role_var + '_traefik_tailscale_enabled', default=false) else 'tailscale-web' }}"
319+
traefik_entrypoint_web_default: "{{ 'web' if not (lookup('vars', traefik_role_var + '_traefik_tailscale_enabled', default=false) | bool) else 'tailscale-web' }}"
320320
traefik_entrypoint_web: "{{ lookup('vars', traefik_role_var + '_traefik_entrypoint_web', default=traefik_entrypoint_web_default) }}"
321-
traefik_entrypoint_websecure_default: "{{ 'websecure' if not lookup('vars', traefik_role_var + '_traefik_tailscale_enabled', default=false) else 'tailscale-websecure' }}"
321+
traefik_entrypoint_websecure_default: "{{ 'websecure' if not (lookup('vars', traefik_role_var + '_traefik_tailscale_enabled', default=false) | bool) else 'tailscale-websecure' }}"
322322
traefik_entrypoint_websecure: "{{ lookup('vars', traefik_role_var + '_traefik_entrypoint_websecure', default=traefik_entrypoint_websecure_default) }}"
323323

324324
################################
@@ -356,8 +356,8 @@ docker_labels_autoheal_template:
356356

357357
docker_labels_saltbox_tmp:
358358
- com.github.saltbox.saltbox_managed: "true"
359-
- "{{ docker_labels_diun_template if lookup('vars', role_name + '_diun_enabled', default=true) else omit }}"
360-
- "{{ docker_labels_autoheal_template if lookup('vars', role_name + '_autoheal_enabled', default=true) else omit }}"
359+
- "{{ docker_labels_diun_template if (lookup('vars', role_name + '_diun_enabled', default=true) | bool) else omit }}"
360+
- "{{ docker_labels_autoheal_template if (lookup('vars', role_name + '_autoheal_enabled', default=true) | bool) else omit }}"
361361

362362
docker_labels_saltbox: "{{ docker_labels_saltbox_tmp | reject('equalto', omit) | list }}"
363363

@@ -450,7 +450,7 @@ svm: https://svm.saltbox.dev/version?url=
450450

451451
reboot_is_necessary: false
452452
skip_dns: "{{ not (dns.ipv4 or dns.ipv6) }}"
453-
role_dns_enabled: "{{ lookup('vars', role_name + '_dns_enabled', default=true) }}"
453+
role_dns_enabled: "{{ lookup('vars', role_name + '_dns_enabled', default=true) | bool }}"
454454
docker_legacy_volume: false
455455

456456
################################

‎resources/tasks/docker/create_docker_container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
uts: "{{ lookup('vars', _var_prefix + '_docker_uts', default=omit) }}"
110110
volume_driver: "{{ lookup('vars', _var_prefix + '_docker_volume_driver', default=omit) }}"
111111
volumes: "{{ ((docker_volumes_common + lookup('vars', _var_prefix + '_docker_volumes', default=omit))
112-
if lookup('vars', _var_prefix + '_docker_volumes_global', default=true)
112+
if (lookup('vars', _var_prefix + '_docker_volumes_global', default=true) | bool)
113113
else lookup('vars', _var_prefix + '_docker_volumes', default=omit)) | unique | reject('equalto', omit) | list }}"
114114
volumes_from: "{{ lookup('vars', _var_prefix + '_docker_volumes_from', default=omit) }}"
115115
working_dir: "{{ lookup('vars', _var_prefix + '_docker_working_dir', default=omit) }}"

0 commit comments

Comments
 (0)