Skip to content

Commit

Permalink
Remove jinja2 templating from assertion predicates.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ianvdl committed Apr 18, 2024
1 parent d36c677 commit 52394cf
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/install_dbserver/tasks/validate_install_dbserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/setup_dbt2/tasks/validate_setup_dbt2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/setup_dbt3/tasks/validate_setup_dbt3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/setup_dbt7/tasks/validate_setup_dbt7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/setup_pgpool2/tasks/validate_setup_pgpool2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down

0 comments on commit 52394cf

Please sign in to comment.