Fixes wazuh#102

paulcalabro · Dec 12, 2018 · 322ebe5 · 322ebe5
1 parent aa1dfcd
commit 322ebe5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
@@ -71,7 +71,9 @@
 - 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', '<='))
 
 - 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
@@ -12,7 +12,9 @@
 - 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', '<='))
 
 - name: Kibana configuration
   template:

diff --git a/roles/elastic-stack/ansible-logstash/tasks/main.yml b/roles/elastic-stack/ansible-logstash/tasks/main.yml
@@ -11,7 +11,9 @@
 - 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', '<='))
 
 - 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
@@ -16,7 +16,9 @@
 - 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', '<='))
 
 - name: Ensure Filebeat is started and enabled at boot.
   service: