From 88c9d81cc5c0a687a57b89f9eecef33f0bcd6ef1 Mon Sep 17 00:00:00 2001 From: Ian van der Linde Date: Thu, 18 Apr 2024 08:46:35 +0200 Subject: [PATCH] Also address jinja2 predicate issues in barman, efm and pem server tasks --- .../setup_barmanserver/tasks/validate_setup_barmanserver.yml | 2 +- roles/setup_efm/tasks/validate_setup_efm.yml | 4 ++-- roles/setup_pemserver/tasks/validate_setup_pemserver.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/setup_barmanserver/tasks/validate_setup_barmanserver.yml b/roles/setup_barmanserver/tasks/validate_setup_barmanserver.yml index 7c5ad8ee..f153defe 100644 --- a/roles/setup_barmanserver/tasks/validate_setup_barmanserver.yml +++ b/roles/setup_barmanserver/tasks/validate_setup_barmanserver.yml @@ -8,7 +8,7 @@ - name: Check that all required barman packages have been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[item] }} is defined" + - ansible_facts.packages[item] is defined fail_msg: "Package {{ item }} has not been installed." success_msg: "Package {{ item }} has been installed." loop: diff --git a/roles/setup_efm/tasks/validate_setup_efm.yml b/roles/setup_efm/tasks/validate_setup_efm.yml index 83f301ea..63972709 100644 --- a/roles/setup_efm/tasks/validate_setup_efm.yml +++ b/roles/setup_efm/tasks/validate_setup_efm.yml @@ -55,7 +55,7 @@ - name: Check that all required packages have been installed on RedHat ansible.builtin.assert: that: - - "{{ ansible_facts.packages[item] }} is defined" + - ansible_facts.packages[item] is defined fail_msg: "Package {{ item }} has not been installed." success_msg: "Package {{ item }} has been installed." loop: @@ -66,7 +66,7 @@ - name: Check that all required packages have been installed on Debian ansible.builtin.assert: that: - - "{{ ansible_facts.packages[item] }} is defined" + - ansible_facts.packages[item] is defined fail_msg: "Package {{ item }} has not been installed." success_msg: "Package {{ item }} has been installed." loop: diff --git a/roles/setup_pemserver/tasks/validate_setup_pemserver.yml b/roles/setup_pemserver/tasks/validate_setup_pemserver.yml index 1d461a23..29041153 100644 --- a/roles/setup_pemserver/tasks/validate_setup_pemserver.yml +++ b/roles/setup_pemserver/tasks/validate_setup_pemserver.yml @@ -67,7 +67,7 @@ - name: Check that all required packages have been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[item] }} is defined" + - ansible_facts.packages[item] is defined fail_msg: "Package {{ item }} has not been installed." success_msg: "Package {{ item }} has been installed." loop: "{{ pem_server_packages }}"