diff options
author | Russell Teague <rteague@redhat.com> | 2017-12-13 10:10:23 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-13 10:10:23 -0500 |
commit | 0aa01db01608dc01550336d55f33f248ef81ead6 (patch) | |
tree | e525f37381a3e6ddfd14e49545d2781579240e31 /roles/contiv_facts/tasks | |
parent | 1328147663f57872554cb7f1b10a0d823844229a (diff) | |
parent | 17ba2eafc5b7f132ad4b0a2e63d57bb647436c68 (diff) | |
download | openshift-0aa01db01608dc01550336d55f33f248ef81ead6.tar.gz openshift-0aa01db01608dc01550336d55f33f248ef81ead6.tar.bz2 openshift-0aa01db01608dc01550336d55f33f248ef81ead6.tar.xz openshift-0aa01db01608dc01550336d55f33f248ef81ead6.zip |
Merge pull request #6315 from riffraff169/contiv-multimaster
Multimaster openshift+contiv fixes
Diffstat (limited to 'roles/contiv_facts/tasks')
-rw-r--r-- | roles/contiv_facts/tasks/rpm.yml | 9 |
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" |