From 9ffd4801ef0e9690666cfecccd0c1e9c2cdfe163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Thu, 22 Jun 2017 07:44:43 +0200
Subject: [PATCH] move iptables setup to openshift-prereq

---
 roles/iptables/tasks/main.yml         | 12 ------------
 roles/openshift-prereq/tasks/main.yml | 11 +++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 roles/iptables/tasks/main.yml

diff --git a/roles/iptables/tasks/main.yml b/roles/iptables/tasks/main.yml
deleted file mode 100644
index ed29d45..0000000
--- a/roles/iptables/tasks/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-  - name: Install iptables-services
-    yum: name=iptables-services state=installed
-    tags: rpm
-
-  - name: Disable firewalld
-    service: name=firewalld state=stopped enabled=no
-    ignore_errors: yes # The firewalld service might not be installed, ignore error
-
-  - name: Enable iptables
-    service: name=iptables state=started enabled=yes
diff --git a/roles/openshift-prereq/tasks/main.yml b/roles/openshift-prereq/tasks/main.yml
index cf37719..de30c34 100644
--- a/roles/openshift-prereq/tasks/main.yml
+++ b/roles/openshift-prereq/tasks/main.yml
@@ -7,6 +7,17 @@
         - "ansible_os_family == 'RedHat'"
         - "ansible_distribution_version == '7.3'"
 
+  - name: Install iptables-services
+    yum: name=iptables-services state=installed
+    tags: rpm
+
+  - name: Disable firewalld
+    service: name=firewalld state=stopped enabled=no
+    ignore_errors: yes # The firewalld service might not be installed, ignore error
+
+  - name: Enable iptables
+    service: name=iptables state=started enabled=yes
+
   - name: First, disable any repos (using subscription-manager)
     command: subscription-manager repos --disable="*"
     tags: rpm