diff options
| author | Russell Teague <rteague@redhat.com> | 2016-11-23 09:58:31 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2016-11-23 09:58:31 -0500 |
| commit | c1ad62d179fe978e08b39ffee1975dac596c1a7a (patch) | |
| tree | 8dac9878a6f82cb5b7823b87c13119699d733077 | |
| parent | fb357a2c39bb06624fd387fc490947163bbf3e0b (diff) | |
| download | openshift-c1ad62d179fe978e08b39ffee1975dac596c1a7a.tar.gz openshift-c1ad62d179fe978e08b39ffee1975dac596c1a7a.tar.bz2 openshift-c1ad62d179fe978e08b39ffee1975dac596c1a7a.tar.xz openshift-c1ad62d179fe978e08b39ffee1975dac596c1a7a.zip | |
Systemd `systemctl show` workaround
`systemctl show` would exit with RC=1 for non-existent services in v231.
This caused the Ansible systemd module to exit with a failure of running the
`systemctl show` command instead of exiting stating the service was not found.
This change catches both failures on either older or newer versions of systemd.
The change in systemd exit status could be resolved in systemd v232.
https://github.com/systemd/systemd/commit/3dced37b7c2c9a5c733817569d2bbbaa397adaf7
| -rw-r--r-- | roles/os_firewall/tasks/firewall/firewalld.yml | 2 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/firewall/iptables.yml | 2 |
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 |