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.
---
playbooks/common/openshift-cluster/config.yml | 4 ++++
playbooks/common/openshift-cluster/std_include.yml | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'playbooks/common')
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
--
cgit v1.2.3