From 17ba2eafc5b7f132ad4b0a2e63d57bb647436c68 Mon Sep 17 00:00:00 2001
From: Lance Dillon <landillo@cisco.com>
Date: Tue, 28 Nov 2017 11:26:34 -0800
Subject: Multimaster openshift+contiv fixes
Only run default contiv commands once
Fix detection of firewalld
Open up netmaster ports to all nodes
Make sure etcd ca stuff only runs once
---
roles/contiv_facts/tasks/rpm.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
(limited to 'roles/contiv_facts/tasks')
diff --git a/roles/contiv_facts/tasks/rpm.yml b/roles/contiv_facts/tasks/rpm.yml
index 07401a6dd..d12436f96 100644
--- a/roles/contiv_facts/tasks/rpm.yml
+++ b/roles/contiv_facts/tasks/rpm.yml
@@ -6,10 +6,17 @@
failed_when: false
check_mode: no
+- name: RPM | Determine if firewalld enabled
+ command: "systemctl status firewalld.service"
+ register: ss
+ changed_when: false
+ failed_when: false
+ check_mode: no
+
- name: Set the has_firewalld fact
set_fact:
has_firewalld: true
- when: s.rc == 0
+ when: s.rc == 0 and ss.rc == 0
- name: Determine if iptables-services installed
command: "rpm -q iptables-services"
--
cgit v1.2.3