From ece3cf9aa66e0974e7f30ffb5798b23c64fd04cc Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Mon, 14 Aug 2017 15:25:28 -0400
Subject: Additional os_firewall role refactoring

* Remove openshift_facts dependency
* Move firewall initialization from std_include.yml to
openshift_cluster/config.yml

Installing firewall packages is only necessary during OpenShift
installation.
---
 roles/os_firewall/tasks/firewall/firewalld.yml | 51 --------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 roles/os_firewall/tasks/firewall/firewalld.yml

(limited to 'roles/os_firewall/tasks/firewall/firewalld.yml')

diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml
deleted file mode 100644
index 2cc7af478..000000000
--- a/roles/os_firewall/tasks/firewall/firewalld.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- name: Install firewalld packages
-  package:
-    name: firewalld
-    state: present
-
-- name: Ensure iptables services are not enabled
-  systemd:
-    name: "{{ item }}"
-    state: stopped
-    enabled: no
-    masked: yes
-  with_items:
-    - iptables
-    - ip6tables
-  register: task_result
-  failed_when: task_result|failed and 'could not' not in task_result.msg|lower
-
-- name: Wait 10 seconds after disabling iptables
-  pause:
-    seconds: 10
-  when: task_result | changed
-
-- name: Start and enable firewalld service
-  systemd:
-    name: firewalld
-    state: started
-    enabled: yes
-    masked: no
-    daemon_reload: yes
-  register: result
-
-- name: need to pause here, otherwise the firewalld service starting can sometimes cause ssh to fail
-  pause: seconds=10
-  when: result | changed
-
-- name: Restart polkitd
-  systemd:
-    name: polkit
-    state: restarted
-  when: result | changed
-
-# Fix suspected race between firewalld and polkit BZ1436964
-- name: Wait for polkit action to have been created
-  command: pkaction --action-id=org.fedoraproject.FirewallD1.config.info
-  ignore_errors: true
-  register: pkaction
-  changed_when: false
-  until: pkaction.rc == 0
-  retries: 6
-  delay: 10
-- 
cgit v1.2.3