Fix for Fedora (python3).

robertdebock · Oct 10, 2018 · da5abb2 · da5abb2
1 parent ba8b4a9
commit da5abb2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/molecule/centos-latest/molecule.yml b/molecule/centos-latest/molecule.yml
@@ -12,8 +12,6 @@ platforms:
     image: centos:latest
 provisioner:
   name: ansible
-  extra_vars:
-    ansible_python_interpreter: /usr/bin/python3
   lint:
     name: ansible-lint
 scenario:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,5 +1,11 @@
 ---
 # tasks file for firewall
+- name: use configured python version
+  set_fact:
+    ansible_python_interpreter: "{{ firewall_ansible_python_interpreter[ansible_distribution ~ '-' ~ ansible_distribution_major_version]
+                                |default(firewall_ansible_python_interpreter[ansible_distribution]
+                                |default(firewall_ansible_python_interpreter['default'])) }}"
+
 - name: remove conflicting software
   package:
     name: "{{ firewall_packages['conflicting'][ansible_distribution]
@@ -80,8 +86,9 @@
 - name: configure iptables
   template:
     src: iptables.j2
-    dest: "{{ firewall_iptables_rulefile[ansible_distribution]
-          | default(firewall_iptables_rulefile['default'] }}"
+    dest: "{{ firewall_iptables_rulefile[ansible_distribution ~ '-' ~ ansible_distribution_major_version]
+          | default(firewall_iptables_rulefile[ansible_distribution]
+          | default(firewall_iptables_rulefile['default'])) }}"
     validate: "iptables-restore --test %s"
   when:
     - ansible_virtualization_type != "docker"

diff --git a/vars/main.yml b/vars/main.yml
@@ -1,5 +1,9 @@
 ---
 # vars file for firewall
+firewall_ansible_python_interpreter:
+  default: /usr/bin/python
+  Fedora: /usr/bin/python3
+
 firewall_packages:
   required:
     default:
@@ -14,6 +18,7 @@ firewall_packages:
       - iptables-services
     Fedora:
       - firewalld
+      - python3-firewall
     openSUSE Leap:
       - firewalld
     openSUSE Tumbleweed: