summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-08-10 21:13:54 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-08-10 22:59:48 -0400
commit7d50ffe98dfa17e3fb72627699c794843ed5295d (patch)
tree8292dff0a7ed50f79a728da44f40d3a08b397aaa /playbooks/common/openshift-cluster
parentba96f5eaf876f6b7568ac73794a08cbe759dceee (diff)
downloadopenshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.tar.gz
openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.tar.bz2
openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.tar.xz
openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.zip
Updated README to reflect refactor. Moved firewall initialize into separate file.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/config.yml15
-rw-r--r--playbooks/common/openshift-cluster/initialize_firewall.yml7
-rw-r--r--playbooks/common/openshift-cluster/std_include.yml4
3 files changed, 11 insertions, 15 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 423573540..7136f1c1f 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -26,21 +26,6 @@
tags:
- always
-- name: Setup firewall
- hosts: oo_all_hosts
- tags:
- - always
- tasks:
- # This should move to intialize_facts
- - name: set os_firewall_enabled
- set_fact:
- os_firewall_enabled: true
- os_firewall_use_firewalld: false
-
- - name: Set proper firewall settings
- include_role:
- name: os_firewall
-
- name: Disable excluders
hosts: oo_masters_to_config:oo_nodes_to_config
tags:
diff --git a/playbooks/common/openshift-cluster/initialize_firewall.yml b/playbooks/common/openshift-cluster/initialize_firewall.yml
new file mode 100644
index 000000000..7d7a427d4
--- /dev/null
+++ b/playbooks/common/openshift-cluster/initialize_firewall.yml
@@ -0,0 +1,7 @@
+---
+- name: Initialize host facts
+ hosts: oo_all_hosts
+ tasks:
+ - name: install and configure the proper firewall settings
+ include_role:
+ name: os_firewall
diff --git a/playbooks/common/openshift-cluster/std_include.yml b/playbooks/common/openshift-cluster/std_include.yml
index 6ed31a644..eab16aba0 100644
--- a/playbooks/common/openshift-cluster/std_include.yml
+++ b/playbooks/common/openshift-cluster/std_include.yml
@@ -14,3 +14,7 @@
- include: initialize_openshift_version.yml
tags:
- always
+
+- include: initialize_firewall.yml
+ tags:
+ - always