various: use set theory conditionals

Using intersect to check for a list of tags is cleaner than using or.
saltyorg · Jul 29, 2023 · c474777 · c474777
1 parent 3d83200
commit c474777
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/roles/backup/tasks/main.yml b/roles/backup/tasks/main.yml
@@ -48,7 +48,7 @@
 
     - name: Cron
       ansible.builtin.import_tasks: "cron.yml"
-      when: (('set-backup' in ansible_run_tags) or ('unset-backup' in ansible_run_tags)) and not ('backup' in ansible_run_tags)
+      when: (['set-backup', 'unset-backup'] | intersect(ansible_run_tags)) and not ('backup' in ansible_run_tags)
       tags:
         - set-backup
         - unset-backup

diff --git a/roles/backup2/tasks/main.yml b/roles/backup2/tasks/main.yml
@@ -26,7 +26,7 @@
 
     - name: Cron
       ansible.builtin.import_tasks: "cron.yml"
-      when: (('set-backup2' in ansible_run_tags) or ('unset-backup2' in ansible_run_tags)) and not ('backup2' in ansible_run_tags)
+      when: (['set-backup2', 'unset-backup2'] | intersect(ansible_run_tags)) and not ('backup2' in ansible_run_tags)
       tags:
         - set-backup2
         - unset-backup2

diff --git a/roles/hetzner_nfs/tasks/main.yml b/roles/hetzner_nfs/tasks/main.yml
@@ -14,7 +14,7 @@
     - "../../defaults/hetzner_nfs.yml.default"
 
 - name: Server Tasks
-  when: ('hetzner-nfs-server' in ansible_run_tags) or ('hetzner-nfs-server-uninstall' in ansible_run_tags)
+  when: (['hetzner-nfs-server', 'hetzner-nfs-server-uninstall'] | intersect(ansible_run_tags))
   block:
     - name: "Hetzner NFS Server Tasks"
       ansible.builtin.include_tasks: "hetzner_nfs_server.yml"
@@ -25,7 +25,7 @@
       when: ('hetzner-nfs-server-uninstall' in ansible_run_tags)
 
 - name: Client Tasks
-  when: ('hetzner-nfs-client-mount' in ansible_run_tags) or ('hetzner-nfs-client-unmount' in ansible_run_tags)
+  when: (['hetzner-nfs-client-mount', 'hetzner-nfs-client-unmount'] | intersect(ansible_run_tags))
   block:
     - name: Fail when invalid hetzner_nfs.mount_client is specified
       ansible.builtin.fail:

diff --git a/roles/lldap/tasks/main.yml b/roles/lldap/tasks/main.yml
@@ -46,4 +46,3 @@
 - name: Wait for 60 seconds
   ansible.builtin.wait_for:
     timeout: 60
-  when: ('authelia' in ansible_run_tags) or ('authelia-reset' in ansible_run_tags) or ('lldap-reset' in ansible_run_tags)