From 2b61973d1c325d0d919bfbbbaa45fc45709cc4c6 Mon Sep 17 00:00:00 2001
From: Philipp Rintz <philipp.rintz@myloc.de>
Date: Wed, 11 Nov 2020 15:27:08 +0100
Subject: [PATCH] Fix error when variables were empty

---
 tasks/main.yml  | 10 ++++++----
 vars/centos.yml |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 vars/centos.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index 82199fc..02d08c1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,16 +2,18 @@
 # .. vim: foldmarker=[[[,]]]:foldmethod=marker
 #
 # tasks file for nftables
+
 - name: Import nftables-variables if merged_groups is set
   when: merged_groups
-  set_fact:
-    "{{ groupname }}": "{{ lookup('file',merged_groups_dir ~ groupname) | from_yaml }}"
+  include_vars:
+    file: "{{ merged_groups_dir ~ groupname }}"
+    name: "{{ groupname }}"
   loop: "{{ group_names }}"
   loop_control:
     loop_var: groupname
 
 - name: Combine Rules when merged_groups is set
-  when: merged_groups
+  when: merged_groups and hostvars[inventory_hostname][groupname]|length > 0
   set_fact:
     nft_combined_rules: "{{ nft_combined_rules | default({}) | combine ( hostvars[inventory_hostname][groupname], recursive=True ) }}"
   loop: "{{ group_names }}"
@@ -37,7 +39,7 @@
   when: nft_enabled|bool
 
 - name: Ensure old Iptables packages are in their desired state
-  apt:
+  package:
     name: '{{ nft_old_pkg_list | list }}'
     state: '{{ nft_old_pkg_state }}'
   register: pkg_remove_result
diff --git a/vars/centos.yml b/vars/centos.yml
new file mode 100644
index 0000000..8de5ba2
--- /dev/null
+++ b/vars/centos.yml
@@ -0,0 +1,4 @@
+---
+# vars file for Centos-based distros
+nft_pkg_list:
+  - nftables