summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-08-14 15:25:28 -0400
committerRussell Teague <rteague@redhat.com>2017-08-15 10:12:07 -0400
commitece3cf9aa66e0974e7f30ffb5798b23c64fd04cc (patch)
tree2420111a6d0282743240203c68ba702ee54fdfc9 /playbooks/common/openshift-cluster
parent2dd904feeec57bcb46281a7066b26c140fadfef8 (diff)
downloadopenshift-ece3cf9aa66e0974e7f30ffb5798b23c64fd04cc.tar.gz
openshift-ece3cf9aa66e0974e7f30ffb5798b23c64fd04cc.tar.bz2
openshift-ece3cf9aa66e0974e7f30ffb5798b23c64fd04cc.tar.xz
openshift-ece3cf9aa66e0974e7f30ffb5798b23c64fd04cc.zip
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.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/config.yml4
-rw-r--r--playbooks/common/openshift-cluster/std_include.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 14d7d9822..5d5497acb 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -22,6 +22,10 @@
- docker_image_availability
- docker_storage
+- include: initialize_firewall.yml
+ tags:
+ - always
+
- hosts: localhost
tasks:
- fail:
diff --git a/playbooks/common/openshift-cluster/std_include.yml b/playbooks/common/openshift-cluster/std_include.yml
index 5a1187ec7..6cc56889a 100644
--- a/playbooks/common/openshift-cluster/std_include.yml
+++ b/playbooks/common/openshift-cluster/std_include.yml
@@ -18,7 +18,3 @@
- include: initialize_openshift_version.yml
tags:
- always
-
-- include: initialize_firewall.yml
- tags:
- - always