From 52394cf1d9a73bf2b9a9df450575af346988093e Mon Sep 17 00:00:00 2001 From: Ian van der Linde Date: Thu, 18 Apr 2024 08:06:14 +0200 Subject: [PATCH] Remove jinja2 templating from assertion predicates. This addresses a fatal error in newer Ansible versions caused by a warning stating that "conditional statements should not include jinja2 templating". This warning leads to the fatal error stating that the conditional check is marked as unsafe. This patch removes the jinja templating from the strings and also removes the strings themselves, leaving the bare predicate. --- .../tasks/validate_execute_binary_upgrade.yml | 2 +- roles/install_dbserver/tasks/validate_install_dbserver.yml | 2 +- roles/setup_dbt2/tasks/validate_setup_dbt2.yml | 2 +- roles/setup_dbt2_client/tasks/validate_setup_dbt2_client.yml | 2 +- roles/setup_dbt2_driver/tasks/validate_setup_dbt2_driver.yml | 2 +- roles/setup_dbt3/tasks/validate_setup_dbt3.yml | 2 +- roles/setup_dbt7/tasks/validate_setup_dbt7.yml | 2 +- roles/setup_pgpool2/tasks/validate_setup_pgpool2.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/execute_binary_upgrade/tasks/validate_execute_binary_upgrade.yml b/roles/execute_binary_upgrade/tasks/validate_execute_binary_upgrade.yml index a229a27ce..ef4e2e15f 100644 --- a/roles/execute_binary_upgrade/tasks/validate_execute_binary_upgrade.yml +++ b/roles/execute_binary_upgrade/tasks/validate_execute_binary_upgrade.yml @@ -204,7 +204,7 @@ - name: Check that all required packages have been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[package] }} is defined" + - ansible_facts.packages[package] is defined fail_msg: "Package {{ package }} has not been installed." success_msg: "Package {{ package }} has been installed." loop: "{{ package_list }}" diff --git a/roles/install_dbserver/tasks/validate_install_dbserver.yml b/roles/install_dbserver/tasks/validate_install_dbserver.yml index e1b056b46..483a5873b 100644 --- a/roles/install_dbserver/tasks/validate_install_dbserver.yml +++ b/roles/install_dbserver/tasks/validate_install_dbserver.yml @@ -187,7 +187,7 @@ - name: Check that all required packages have been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[package] }} is defined" + - ansible_facts.packages[package] is defined fail_msg: "Package {{ package }} has not been installed." success_msg: "Package {{ package }} has been installed." loop: "{{ package_list }}" diff --git a/roles/setup_dbt2/tasks/validate_setup_dbt2.yml b/roles/setup_dbt2/tasks/validate_setup_dbt2.yml index 37681f76c..f1f71b784 100644 --- a/roles/setup_dbt2/tasks/validate_setup_dbt2.yml +++ b/roles/setup_dbt2/tasks/validate_setup_dbt2.yml @@ -18,7 +18,7 @@ - name: Check that all packages in dbt2_db_pkg_list has been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[package] }} is defined" + - ansible_facts.packages[package] is defined fail_msg: "Package {{ package }} has not been installed." success_msg: "Package {{ package }} has been installed." loop: "{{ dbt2_db_pkg_list }}" diff --git a/roles/setup_dbt2_client/tasks/validate_setup_dbt2_client.yml b/roles/setup_dbt2_client/tasks/validate_setup_dbt2_client.yml index 85dca83df..5c6355a90 100644 --- a/roles/setup_dbt2_client/tasks/validate_setup_dbt2_client.yml +++ b/roles/setup_dbt2_client/tasks/validate_setup_dbt2_client.yml @@ -11,7 +11,7 @@ - name: Check that all packages in dbt2_client_pkg_list has been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[package] }} is defined" + - ansible_facts.packages[package] is defined fail_msg: "Package {{ package }} has not been installed." success_msg: "Package {{ package }} has been installed." loop: "{{ dbt2_client_pkg_list }}" diff --git a/roles/setup_dbt2_driver/tasks/validate_setup_dbt2_driver.yml b/roles/setup_dbt2_driver/tasks/validate_setup_dbt2_driver.yml index 7f6afa3f4..d971929d8 100644 --- a/roles/setup_dbt2_driver/tasks/validate_setup_dbt2_driver.yml +++ b/roles/setup_dbt2_driver/tasks/validate_setup_dbt2_driver.yml @@ -11,7 +11,7 @@ - name: Check that all packages in dbt2_driver_pkg_list has been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[package] }} is defined" + - ansible_facts.packages[package] is defined fail_msg: "Package {{ package }} has not been installed." success_msg: "Package {{ package }} has been installed." loop: "{{ dbt2_driver_pkg_list }}" diff --git a/roles/setup_dbt3/tasks/validate_setup_dbt3.yml b/roles/setup_dbt3/tasks/validate_setup_dbt3.yml index a4bd18f17..7d35b5f25 100644 --- a/roles/setup_dbt3/tasks/validate_setup_dbt3.yml +++ b/roles/setup_dbt3/tasks/validate_setup_dbt3.yml @@ -11,7 +11,7 @@ - name: Check that all packages in dbt3_db_pkg_list has been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[package] }} is defined" + - ansible_facts.packages[package] is defined fail_msg: "Package {{ package }} has not been installed." success_msg: "Package {{ package }} has been installed." loop: "{{ dbt3_db_pkg_list }}" diff --git a/roles/setup_dbt7/tasks/validate_setup_dbt7.yml b/roles/setup_dbt7/tasks/validate_setup_dbt7.yml index 4e308074b..fd1d2df6c 100644 --- a/roles/setup_dbt7/tasks/validate_setup_dbt7.yml +++ b/roles/setup_dbt7/tasks/validate_setup_dbt7.yml @@ -11,7 +11,7 @@ - name: Check that all packages in dbt7_db_pkg_list has been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[package] }} is defined" + - ansible_facts.packages[package] is defined fail_msg: "Package {{ package }} has not been installed." success_msg: "Package {{ package }} has been installed." loop: "{{ dbt7_db_pkg_list }}" diff --git a/roles/setup_pgpool2/tasks/validate_setup_pgpool2.yml b/roles/setup_pgpool2/tasks/validate_setup_pgpool2.yml index 738d0be2e..72c25ad8b 100644 --- a/roles/setup_pgpool2/tasks/validate_setup_pgpool2.yml +++ b/roles/setup_pgpool2/tasks/validate_setup_pgpool2.yml @@ -55,7 +55,7 @@ - name: Check that all required pgpool2 packages have been installed ansible.builtin.assert: that: - - "{{ ansible_facts.packages[package] }} is defined" + - ansible_facts.packages[package] is defined fail_msg: "Package {{ package }} has not been installed." success_msg: "Package {{ package }} has been installed." loop: "{{ pgpool2_packages_check }}"