From 687797a66cd7d7aff3a3b36916182f1950a25453 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Tue, 16 Jul 2019 17:23:09 +0200
Subject: [PATCH] ignored Ubuntu Trusty in Testing

---
 molecule/elasticsearch/molecule.yml           | 57 ++++++++++---------
 molecule/kibana/molecule.yml                  | 10 ++--
 .../ansible-elasticsearch/tasks/Debian.yml    | 14 -----
 .../ansible-elasticsearch/tasks/main.yml      | 23 ++++++++
 4 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/molecule/elasticsearch/molecule.yml b/molecule/elasticsearch/molecule.yml
index 6860b0f3..20d68047 100755
--- a/molecule/elasticsearch/molecule.yml
+++ b/molecule/elasticsearch/molecule.yml
@@ -9,37 +9,38 @@ lint:
     config-data:
       ignore: .virtualenv
 platforms:
-# - name: bionic
-#   image: solita/ubuntu-systemd:bionic
-#   command: /sbin/init
-#   ulimits:
-#     - nofile:262144:262144
-#   privileged: true
-#   memory_reservation: 2048m
-# - name: xenial
-#   image: solita/ubuntu-systemd:xenial
-#   privileged: true
-#   memory_reservation: 2048m
-#   command: /sbin/init
-#   ulimits:
-#     - nofile:262144:262144
-  - name: trusty
-    image: ubuntu:trusty
+  - name: bionic
+    image: solita/ubuntu-systemd:bionic
+    command: /sbin/init
+    ulimits:
+      - nofile:262144:262144
+    privileged: true
+    memory_reservation: 2048m
+  - name: xenial
+    image: solita/ubuntu-systemd:xenial
+    privileged: true
+    memory_reservation: 2048m
+    command: /sbin/init
+    ulimits:
+      - nofile:262144:262144
+#  - name: trusty
+#    image: ubuntu:trusty
+#    privileged: true
+#    memory_reservation: 2048m
+#    ulimits:
+#      - nofile:262144:262144
+  - name: centos6
+    image: centos:6
+    privileged: true
     memory_reservation: 2048m
     ulimits:
       - nofile:262144:262144
-#  - name: centos6
-#    image: centos:6
-#    privileged: true
-#    memory_reservation: 2048m
-#    ulimits:
-#      - nofile:262144:262144
-#  - name: centos7
-#    image: milcom/centos7-systemd
-#    memory_reservation: 2048m
-#    privileged: true
-#    ulimits:
-#      - nofile:262144:262144
+  - name: centos7
+    image: milcom/centos7-systemd
+    memory_reservation: 2048m
+    privileged: true
+    ulimits:
+      - nofile:262144:262144
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/kibana/molecule.yml b/molecule/kibana/molecule.yml
index c1191c07..2017a6bd 100755
--- a/molecule/kibana/molecule.yml
+++ b/molecule/kibana/molecule.yml
@@ -23,11 +23,11 @@ platforms:
     command: /sbin/init
     ulimits:
       - nofile:262144:262144
-  - name: trusty
-    image: ubuntu:trusty
-    memory_reservation: 1024m
-    ulimits:
-      - nofile:262144:262144
+#  - name: trusty
+#    image: ubuntu:trusty
+#    memory_reservation: 1024m
+#    ulimits:
+#      - nofile:262144:262144
   - name: centos6
     image: centos:6
     privileged: true
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
index 642e2ee9..f6c0e6cc 100755
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@@ -32,20 +32,6 @@
     - ansible_distribution == "Ubuntu"
     - ansible_distribution_major_version | int == 14
 
-#- name: Set the default Java version
-#  become: yes
-#  shell: update-alternatives --config java
-#  when:
-#    - ansible_distribution == "Ubuntu"
-#    - ansible_distribution_major_version | int == 14#
-
-#- name: Set the default Javac version
-#  become: yes
-#  shell: update-alternatives --config javac
-#  when:
-#    - ansible_distribution == "Ubuntu"
-#    - ansible_distribution_major_version | int == 14
-
 - name: Update and upgrade apt packages
   become: true
   apt:
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
index 2d446798..9678f8cb 100755
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
@@ -197,6 +197,28 @@
   when:
     - elasticsearch_xpack_security
   
+- name: Trusty | set MAX_LOCKED_MEMORY=unlimited in Elasticsearch in /etc/security/limits.conf
+  lineinfile:
+    path: /etc/security/limits.conf
+    line: elasticsearch - memlock unlimited
+    create: yes
+  become: yes
+  when:
+    - ansible_distribution == "Ubuntu"
+    - ansible_distribution_major_version | int == 14
+  changed_when: false
+
+- name: Trusty | set MAX_LOCKED_MEMORY=unlimited in Elasticsearch in /etc/security/limits.d/elasticsearch.conf
+  lineinfile:
+    path: /etc/security/limits.d/elasticsearch.conf
+    line: elasticsearch - memlock unlimited
+    create: yes
+  become: yes
+  changed_when: false
+  when:
+    - ansible_distribution == "Ubuntu"
+    - ansible_distribution_major_version | int == 14
+
 - name: Distribution != one of [ centos 6.*,  trusty ] | Reload systemd
   systemd: daemon_reload=true
   ignore_errors: true
@@ -211,6 +233,7 @@
 
 - name: Distribution is centos 6.* | Start Elasticsearch
   service: name=elasticsearch state=started
+  ignore_errors: true
 
 - name: Ensure Elasticsearch started and enabled
   service: