summaryrefslogtreecommitdiffstats
path: root/roles/contiv_facts
diff options
context:
space:
mode:
authorLance Dillon <landillo@cisco.com>2017-11-28 11:26:34 -0800
committerLance Dillon <landillo@cisco.com>2017-11-29 11:33:24 -0800
commit17ba2eafc5b7f132ad4b0a2e63d57bb647436c68 (patch)
treecee5270467a8d43c1ad35e3ef4cee16b9fa078fc /roles/contiv_facts
parent6b6b422245be79dd3eec0c93a58875c646bbfba7 (diff)
downloadopenshift-17ba2eafc5b7f132ad4b0a2e63d57bb647436c68.tar.gz
openshift-17ba2eafc5b7f132ad4b0a2e63d57bb647436c68.tar.bz2
openshift-17ba2eafc5b7f132ad4b0a2e63d57bb647436c68.tar.xz
openshift-17ba2eafc5b7f132ad4b0a2e63d57bb647436c68.zip
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
Diffstat (limited to 'roles/contiv_facts')
-rw-r--r--roles/contiv_facts/tasks/rpm.yml9
1 files changed, 8 insertions, 1 deletions
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"