From e6ba94d4b9c4e64d7f5401890943234b076dafc0 Mon Sep 17 00:00:00 2001 From: Carlos Dominguez <43823505+cadoming@users.noreply.github.com> Date: Thu, 20 Dec 2018 17:58:55 +0100 Subject: [PATCH] exception reload systemd task (#114) --- roles/elastic-stack/ansible-elasticsearch/tasks/main.yml | 5 ++++- roles/elastic-stack/ansible-kibana/tasks/main.yml | 5 ++++- roles/elastic-stack/ansible-logstash/tasks/main.yml | 5 ++++- roles/wazuh/ansible-filebeat/tasks/main.yml | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml index b5afdf5f..fb566741 100644 --- a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml +++ b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml @@ -71,7 +71,10 @@ - name: Reload systemd systemd: daemon_reload=yes ignore_errors: yes - when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + when: + - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<')) + - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<')) - name: Ensure Elasticsearch started and enabled service: diff --git a/roles/elastic-stack/ansible-kibana/tasks/main.yml b/roles/elastic-stack/ansible-kibana/tasks/main.yml index 4d81579f..db85a112 100644 --- a/roles/elastic-stack/ansible-kibana/tasks/main.yml +++ b/roles/elastic-stack/ansible-kibana/tasks/main.yml @@ -12,7 +12,10 @@ - name: Reload systemd systemd: daemon_reload=yes ignore_errors: yes - when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + when: + - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<')) + - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<')) - name: Kibana configuration template: diff --git a/roles/elastic-stack/ansible-logstash/tasks/main.yml b/roles/elastic-stack/ansible-logstash/tasks/main.yml index d88082c8..a53ab166 100644 --- a/roles/elastic-stack/ansible-logstash/tasks/main.yml +++ b/roles/elastic-stack/ansible-logstash/tasks/main.yml @@ -11,7 +11,10 @@ - name: Reload systemd systemd: daemon_reload=yes ignore_errors: yes - when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + when: + - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<')) + - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<')) - name: Amazon Linux create service shell: /usr/share/logstash/bin/system-install /etc/logstash/startup.options diff --git a/roles/wazuh/ansible-filebeat/tasks/main.yml b/roles/wazuh/ansible-filebeat/tasks/main.yml index 29ba695c..5138e2d8 100644 --- a/roles/wazuh/ansible-filebeat/tasks/main.yml +++ b/roles/wazuh/ansible-filebeat/tasks/main.yml @@ -16,7 +16,10 @@ - name: Reload systemd systemd: daemon_reload=yes ignore_errors: yes - when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + when: + - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA") + - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<')) + - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<')) - name: Ensure Filebeat is started and enabled at boot. service: