commit 69ef231fec01c705f81c9ddae5240090d5710a44
author Michal Ptacek <m.ptacek@partner.samsung.com> Mon Mar 04 14:52:04 2019 +0000
committer Gerrit Code Review <gerrit@onap.org> Mon Mar 04 14:52:04 2019 +0000
tree 843d8ce61effd2b9c06020fa27a3be6909bdca24
parent 1fa643c880dc4e59c1a8fe2c0e3350a7ba44ea00
parent 8bd90d9023e43ae59effb75caef2a68cc00abe3a

Merge "Use 'package_facts' module in firewall role"

ansible/infrastructure.yml

diff --git a/ansible/infrastructure.yml b/ansible/infrastructure.yml
index 89d63e8..7d75dc7 100644
--- a/ansible/infrastructure.yml
+++ b/ansible/infrastructure.yml
@@ -4,8 +4,6 @@
   roles:
     - package-repository
     - role: firewall
-      vars:
-        state: disable
 
 - name: Setup infrastructure servers
   hosts: infrastructure

ansible/roles/firewall/defaults/main.yml

diff --git a/ansible/roles/firewall/defaults/main.yml b/ansible/roles/firewall/defaults/main.yml
new file mode 100644
index 0000000..7cc9ae9
--- /dev/null
+++ b/ansible/roles/firewall/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+firewall:
+  state: disable
+  package_name:
+    RedHat: 'firewalld'
+    Debian: 'ufw'

ansible/roles/firewall/tasks/firewall-disable.yml

diff --git a/ansible/roles/firewall/tasks/firewall-disable.yml b/ansible/roles/firewall/tasks/firewall-disable.yml
index 9a8a2c1..f406d94 100644
--- a/ansible/roles/firewall/tasks/firewall-disable.yml
+++ b/ansible/roles/firewall/tasks/firewall-disable.yml
@@ -1,16 +1,14 @@
 ---
-- name: Check if firewalld is installed
-  yum:
-    list: firewalld
-    disablerepo: "*"
-  register: firewalld_check
+- name: Get installed packages list
+  package_facts:
+    manager: "auto"
 
-- name: Stop and disable firewalld if exists
+- name: Stop and disable default OS firewall if exists
   service:
-    name: firewalld
+    name: "{{ firewall.package_name[ansible_facts.os_family] }}"
     state: stopped
     enabled: no
-  when: firewalld_check.results|selectattr('yumstate', 'match', 'installed')|list|length != 0
+  when: firewall.package_name[ansible_facts.os_family] in ansible_facts.packages
 
 - name: Flush iptables
   iptables:

ansible/roles/firewall/tasks/main.yml

diff --git a/ansible/roles/firewall/tasks/main.yml b/ansible/roles/firewall/tasks/main.yml
index f7bb7c7..29ea195 100644
--- a/ansible/roles/firewall/tasks/main.yml
+++ b/ansible/roles/firewall/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- include_tasks: "firewall-{{ state }}.yml"
+- include_tasks: "firewall-{{ firewall.state }}.yml"