mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-03-26 21:33:05 +00:00
Fix Ansible warnings in Firewalld zone testing tasks
The firewalld zone verification tasks in ipaserver, ipareplica, and ipabackup roles were triggering Ansible warnings due to variable ipareplica_firewalld_zone not being defined when evaluating the task name. This fix remove the Jinja template from the task names and wrap the tasks in a single block so the variable verification is done only once. Signed-off-by: Rafael Guterres Jeffman <rjeffman@redhat.com>
This commit is contained in:
@@ -91,20 +91,21 @@
|
|||||||
enabled: yes
|
enabled: yes
|
||||||
state: started
|
state: started
|
||||||
|
|
||||||
- name: Firewalld - Verify runtime zone "{{ ipabackup_firewalld_zone }}"
|
- name: Firewalld - Verify zones
|
||||||
ansible.builtin.shell: >
|
|
||||||
firewall-cmd
|
|
||||||
--info-zone="{{ ipabackup_firewalld_zone }}"
|
|
||||||
>/dev/null
|
|
||||||
when: ipabackup_firewalld_zone is defined
|
when: ipabackup_firewalld_zone is defined
|
||||||
|
block:
|
||||||
|
- name: Firewalld - Verify runtime zone from ipabackup_firewalld_zone
|
||||||
|
ansible.builtin.shell: >
|
||||||
|
firewall-cmd
|
||||||
|
--info-zone="{{ ipabackup_firewalld_zone }}"
|
||||||
|
>/dev/null
|
||||||
|
|
||||||
- name: Firewalld - Verify permanent zone "{{ ipabackup_firewalld_zone }}"
|
- name: Firewalld - Verify permanent zone from ipabackup_firewalld_zone
|
||||||
ansible.builtin.shell: >
|
ansible.builtin.shell: >
|
||||||
firewall-cmd
|
firewall-cmd
|
||||||
--permanent
|
--permanent
|
||||||
--info-zone="{{ ipabackup_firewalld_zone }}"
|
--info-zone="{{ ipabackup_firewalld_zone }}"
|
||||||
>/dev/null
|
>/dev/null
|
||||||
when: ipabackup_firewalld_zone is defined
|
|
||||||
|
|
||||||
### RESTORE
|
### RESTORE
|
||||||
|
|
||||||
|
|||||||
@@ -47,20 +47,21 @@
|
|||||||
enabled: yes
|
enabled: yes
|
||||||
state: started
|
state: started
|
||||||
|
|
||||||
- name: Firewalld - Verify runtime zone "{{ ipareplica_firewalld_zone }}"
|
- name: Firewalld - Verify zones
|
||||||
ansible.builtin.shell: >
|
|
||||||
firewall-cmd
|
|
||||||
--info-zone="{{ ipareplica_firewalld_zone }}"
|
|
||||||
>/dev/null
|
|
||||||
when: ipareplica_firewalld_zone is defined
|
when: ipareplica_firewalld_zone is defined
|
||||||
|
block:
|
||||||
|
- name: Firewalld - Verify runtime zone from ipareplica_firewalld_zone
|
||||||
|
ansible.builtin.shell: >
|
||||||
|
firewall-cmd
|
||||||
|
--info-zone="{{ ipareplica_firewalld_zone }}"
|
||||||
|
>/dev/null
|
||||||
|
|
||||||
- name: Firewalld - Verify permanent zone "{{ ipareplica_firewalld_zone }}"
|
- name: Firewalld - Verify permanent zone from ipareplica_firewalld_zone
|
||||||
ansible.builtin.shell: >
|
ansible.builtin.shell: >
|
||||||
firewall-cmd
|
firewall-cmd
|
||||||
--permanent
|
--permanent
|
||||||
--info-zone="{{ ipareplica_firewalld_zone }}"
|
--info-zone="{{ ipareplica_firewalld_zone }}"
|
||||||
>/dev/null
|
>/dev/null
|
||||||
when: ipareplica_firewalld_zone is defined
|
|
||||||
|
|
||||||
- name: Install - Set ipareplica_servers
|
- name: Install - Set ipareplica_servers
|
||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
|
|||||||
@@ -47,20 +47,21 @@
|
|||||||
enabled: yes
|
enabled: yes
|
||||||
state: started
|
state: started
|
||||||
|
|
||||||
- name: Firewalld - Verify runtime zone "{{ ipaserver_firewalld_zone }}"
|
- name: Firewalld - verify zones
|
||||||
ansible.builtin.shell: >
|
|
||||||
firewall-cmd
|
|
||||||
--info-zone="{{ ipaserver_firewalld_zone }}"
|
|
||||||
>/dev/null
|
|
||||||
when: ipaserver_firewalld_zone is defined
|
when: ipaserver_firewalld_zone is defined
|
||||||
|
block:
|
||||||
|
- name: Firewalld - Verify runtime zone from ipaserver_firewalld_zone
|
||||||
|
ansible.builtin.shell: >
|
||||||
|
firewall-cmd
|
||||||
|
--info-zone="{{ ipaserver_firewalld_zone }}"
|
||||||
|
>/dev/null
|
||||||
|
|
||||||
- name: Firewalld - Verify permanent zone "{{ ipaserver_firewalld_zone }}"
|
- name: Firewalld - Verify permanent zone from ipaserver_firewalld_zone
|
||||||
ansible.builtin.shell: >
|
ansible.builtin.shell: >
|
||||||
firewall-cmd
|
firewall-cmd
|
||||||
--permanent
|
--permanent
|
||||||
--info-zone="{{ ipaserver_firewalld_zone }}"
|
--info-zone="{{ ipaserver_firewalld_zone }}"
|
||||||
>/dev/null
|
>/dev/null
|
||||||
when: ipaserver_firewalld_zone is defined
|
|
||||||
|
|
||||||
- name: Copy external certs
|
- name: Copy external certs
|
||||||
ansible.builtin.include_tasks: "{{ role_path }}/tasks/copy_external_cert.yml"
|
ansible.builtin.include_tasks: "{{ role_path }}/tasks/copy_external_cert.yml"
|
||||||
|
|||||||
Reference in New Issue
Block a user