Roles only run on intended supported OS, and minor cleanup of when statements to match
This commit is contained in:
@@ -1,7 +1,17 @@
|
||||
---
|
||||
# tasks file for ensure_firewalld
|
||||
- name: Assert Target OS Is Supported
|
||||
when:
|
||||
- ansible_facts["system"] is defined
|
||||
ansible.builtin.assert:
|
||||
fail_msg: "Unsupported OS: {{ ansible_facts['distribution'] | default('unknown') }}"
|
||||
quiet: true
|
||||
that:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- >-
|
||||
ansible_facts["distribution"] in ['AlmaLinux', 'CentOS', 'Debian',
|
||||
'Fedora', 'OracleLinux', 'Rocky', 'Ubuntu']
|
||||
- name: Include Variables
|
||||
when: ["ansible_facts[\"system\"] == 'Linux'"]
|
||||
ansible.builtin.include_vars:
|
||||
file: '{{ lookup("first_found", findme) }}'
|
||||
name: ensure_firewalld
|
||||
@@ -20,19 +30,16 @@
|
||||
|
||||
- name: Package Discovery
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ansible_facts["packages"] is not defined
|
||||
ansible.builtin.package_facts:
|
||||
|
||||
- name: Service Discovery
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ansible_facts["services"] is not defined
|
||||
ansible.builtin.service_facts:
|
||||
|
||||
- name: Ensure Packages
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_firewalld is defined
|
||||
- ensure_firewalld.package_list is defined
|
||||
- ensure_firewalld.package_list is iterable
|
||||
@@ -46,7 +53,6 @@
|
||||
|
||||
- name: Ensure Services
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_firewalld is defined
|
||||
- ensure_firewalld.service_list is defined
|
||||
- ensure_firewalld.service_list is iterable
|
||||
@@ -64,7 +70,6 @@
|
||||
|
||||
- name: Ensure Default Firewall Rules
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ansible_facts.packages["firewalld"] is defined
|
||||
- ansible_facts.packages["python3-firewall"] is defined
|
||||
- ensure_firewalld is defined
|
||||
@@ -80,3 +85,27 @@
|
||||
|
||||
- name: Flush Handlers
|
||||
ansible.builtin.meta: flush_handlers
|
||||
- name: Post Verification Service Discovery
|
||||
when:
|
||||
- ensure_firewalld is defined
|
||||
- ensure_firewalld.service_list is defined
|
||||
- ensure_firewalld.service_list is iterable
|
||||
ansible.builtin.service_facts:
|
||||
- name: Assert Managed Services Are Active
|
||||
when:
|
||||
- ensure_firewalld is defined
|
||||
- ensure_firewalld.service_list is defined
|
||||
- ensure_firewalld.service_list is iterable
|
||||
ansible.builtin.assert:
|
||||
fail_msg: "Service {{ item.name }} is not active"
|
||||
quiet: true
|
||||
that:
|
||||
- >-
|
||||
item.state != 'started' or
|
||||
(ansible_facts['services'][item.name ~ '.service'] is defined and
|
||||
ansible_facts['services'][item.name ~ '.service']['state'] == 'running') or
|
||||
(ansible_facts['services'][item.name] is defined and
|
||||
ansible_facts['services'][item.name]['state'] == 'running')
|
||||
loop: "{{ ensure_firewalld.service_list }}"
|
||||
loop_control:
|
||||
label: "{{ item.name }} will be verified"
|
||||
|
||||
Reference in New Issue
Block a user