From 26cbd7b91efa211f2f4dc5f57ca4085f4ca996c3 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Thu, 4 Jul 2019 16:22:19 +0200 Subject: [PATCH] abrt: Fix bare variables and lists Add bool filter for variables and with_items replaced with loop. Signed-off-by: Martin Kutlak --- roles/abrt/faf-local-post/tasks/main.yml | 12 ++++++------ roles/abrt/faf-local/tasks/setup_db.yml | 2 +- roles/abrt/retrace-local/tasks/cron.yml | 8 ++++---- roles/abrt/retrace-local/tasks/retrace_setup.yml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/roles/abrt/faf-local-post/tasks/main.yml b/roles/abrt/faf-local-post/tasks/main.yml index 5158dada53..ca7cbdf1ba 100644 --- a/roles/abrt/faf-local-post/tasks/main.yml +++ b/roles/abrt/faf-local-post/tasks/main.yml @@ -5,17 +5,17 @@ become: yes become_user: faf ignore_errors: yes - when: not devel + when: not devel|bool tags: add_repo - with_items: "{{ faf_repos }}" + loop: "{{ faf_repos }}" - name: repoassign repositories command: faf repoassign "{{ item.name }}" "{{ item.opsys }}" "{{ item.arch }}" become: yes become_user: faf - when: not devel + when: not devel|bool tags: add_repo - with_items: "{{ faf_repos }}" + loop: "{{ faf_repos }}" - import_tasks: cron.yml tags: cron @@ -38,5 +38,5 @@ command: "faf cleanup-packages Fedora '{{ item }}' " become: yes become_user: faf - when: not devel - with_items: "{{ rs_internal_fedora_vers_removed }}" + when: not devel|bool + loop: "{{ rs_internal_fedora_vers_removed }}" diff --git a/roles/abrt/faf-local/tasks/setup_db.yml b/roles/abrt/faf-local/tasks/setup_db.yml index 8fc4da3fad..1650bda45b 100644 --- a/roles/abrt/faf-local/tasks/setup_db.yml +++ b/roles/abrt/faf-local/tasks/setup_db.yml @@ -67,7 +67,7 @@ name: faf owner: postgres state: absent - when: faf_recreate_database + when: faf_recreate_database|bool - name: check postgresql initdb stat: diff --git a/roles/abrt/retrace-local/tasks/cron.yml b/roles/abrt/retrace-local/tasks/cron.yml index 5e7a7f68f9..7b585e4960 100644 --- a/roles/abrt/retrace-local/tasks/cron.yml +++ b/roles/abrt/retrace-local/tasks/cron.yml @@ -10,7 +10,7 @@ with_nested: - "{{ rs_internal_fedora_vers }}" - "{{ rs_internal_arch_list }}" - when: not devel + when: not devel|bool - name: Remove obsolete cron job for retrace-server cron: @@ -22,7 +22,7 @@ with_nested: - "{{ rs_internal_fedora_vers_removed }}" - "{{ rs_internal_arch_list }}" - when: not devel + when: not devel|bool - name: Create cron job for retrace-server cron: @@ -31,7 +31,7 @@ job: "/usr/bin/retrace-server-reposync centos 7 x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" special_time: daily state: present - when: not devel + when: not devel|bool - name: Create cron job for retrace-server cron: @@ -40,4 +40,4 @@ job: "/usr/bin/retrace-server-cleanup >> /var/log/retrace-server/cleanup_error.log 2>&1" special_time: daily state: present - when: not devel + when: not devel|bool diff --git a/roles/abrt/retrace-local/tasks/retrace_setup.yml b/roles/abrt/retrace-local/tasks/retrace_setup.yml index 21da1cedc7..f98974f015 100644 --- a/roles/abrt/retrace-local/tasks/retrace_setup.yml +++ b/roles/abrt/retrace-local/tasks/retrace_setup.yml @@ -9,14 +9,14 @@ become: yes become_user: retrace tags: [rs_reposync, rs_fedora] - when: not devel + when: not devel|bool - name: reposync for centos shell: nohup retrace-server-reposync centos 7 x86_64 $(mktemp /tmp/ansible.reposync_for_centosXXXXXX.log) & become: yes become_user: retrace tags: [rs_reposync, rs_fedora] - when: not devel + when: not devel|bool - file: path: /srv/retrace/repos