summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-11-23 11:08:26 -0500
committerGitHub <noreply@github.com>2016-11-23 11:08:26 -0500
commit90fb07f40aa3945e71d3941bca54867c649bc95f (patch)
treed9df22de2042e6c9d59e1d317bb07d83ff5aaa4b
parent02935daff0dff7e05820fc7e088769b45867fec9 (diff)
parentc1ad62d179fe978e08b39ffee1975dac596c1a7a (diff)
downloadopenshift-90fb07f40aa3945e71d3941bca54867c649bc95f.tar.gz
openshift-90fb07f40aa3945e71d3941bca54867c649bc95f.tar.bz2
openshift-90fb07f40aa3945e71d3941bca54867c649bc95f.tar.xz
openshift-90fb07f40aa3945e71d3941bca54867c649bc95f.zip
Merge pull request #2851 from mtnbikenc/os_firewall-fix
Systemd `systemctl show` workaround
-rw-r--r--roles/os_firewall/tasks/firewall/firewalld.yml2
-rw-r--r--roles/os_firewall/tasks/firewall/iptables.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml
index a6039b5f1..1101870be 100644
--- a/roles/os_firewall/tasks/firewall/firewalld.yml
+++ b/roles/os_firewall/tasks/firewall/firewalld.yml
@@ -13,7 +13,7 @@
- iptables
- ip6tables
register: task_result
- failed_when: "task_result|failed and 'Could not find' not in task_result.msg"
+ failed_when: "task_result|failed and 'could not' not in task_result.msg|lower"
- name: Start and enable firewalld service
systemd:
diff --git a/roles/os_firewall/tasks/firewall/iptables.yml b/roles/os_firewall/tasks/firewall/iptables.yml
index 704819d8a..930b32cf2 100644
--- a/roles/os_firewall/tasks/firewall/iptables.yml
+++ b/roles/os_firewall/tasks/firewall/iptables.yml
@@ -7,7 +7,7 @@
enabled: no
masked: yes
register: task_result
- failed_when: "task_result|failed and 'Could not find' not in task_result.msg"
+ failed_when: "task_result|failed and 'could not' not in task_result.msg|lower"
- name: Install iptables packages
package: name={{ item }} state=present