Merge pull request #1116 from Kaali09/release-2.6.5

Log-es upgrade from 6.2.3 to 6.8.6

ansible/roles/log-es6/README.md

@@ -75,7 +75,7 @@ The following illustrates applying configuration parameters to an Elasticsearch
     es_scripts: false
     es_templates: false
     es_version_lock: false
-    es_heap_size: 1g
+    log-es_heap_size: 1g
     es_api_port: 9201
 ```
 
@@ -114,7 +114,7 @@ A more complex example:
     es_scripts: false
     es_templates: false
     es_version_lock: false
-    es_heap_size: 1g
+    log-es_heap_size: 1g
     es_start_service: false
     es_plugins_reinstall: false
     es_api_port: 9201
@@ -140,7 +140,7 @@ An example of a two server deployment is shown below.  The first server holds th
 ```
 - hosts: master_nodes
   roles:
-    - { role: elasticsearch, es_instance_name: "node1", es_heap_size: "1g",
+    - { role: elasticsearch, es_instance_name: "node1", log-es_heap_size: "1g",
     es_config: {
         cluster.name: "test-cluster",
         discovery.zen.ping.unicast.hosts: "elastic02:9300",

ansible/roles/log-es6/defaults/main.yml

 ---
 es_major_version: "6.x"
-es_version: "6.2.3"
+es_version: "6.8.6"
 es_version_lock: false
 es_use_repository: true
 es_templates_fileglob: "files/templates/*.json"
@@ -32,7 +32,8 @@ es_xpack_features: ["alerting","monitoring","graph","ml"]
 es_api_host: "localhost"
 es_api_port: 9200
 es_debian_startup_timeout: 10
-
+env_dir: /etc/default
+log_es_heap_size: "2g"
 # Since ansible 2.2 the following variables need to be defined
 # to allow the role to be conditionally played with a when condition.
 pid_dir: ''

ansible/roles/log-es6/tasks/elasticsearch-Debian.yml

@@ -29,6 +29,18 @@
   include: elasticsearch-Debian-version-lock.yml
   when: es_version_lock
 
+  #Copy the elasticsearch mandatory variable
+
+- name: Copy the elasticsearch mandatory variables
+  become: yes
+  template:
+    src: environment.j2
+    dest: "{{ env_dir }}/elasticsearch"
+    owner: "{{ es_user }}"
+    group: "{{ es_group }}"
+    mode: 0660
+    force: yes
+
 - name: Debian - Ensure elasticsearch is installed
   become: yes
   apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present force={{force_install}} allow_unauthenticated={{ 'no' if es_apt_key else 'yes' }} cache_valid_time=86400

ansible/roles/log-es6/tasks/elasticsearch-config.yml

@@ -15,7 +15,7 @@
   file: path={{ item }} state=directory owner={{ es_user }} group={{ es_group }}
   with_items:
     - "{{data_dirs}}"
-
+    
 #Copy the config template
 - name: Copy Configuration File
   become: yes
@@ -60,8 +60,8 @@
 
 - name: Get information on the RAM
   set_fact:
-    es_heap_size: "{% if ((ansible_memory_mb.real.total/(2*1024))|int) > 26 %}26g{% else %}{{(((ansible_memory_mb.real.total/(2*1024))+1)|int)}}g{% endif %}"
-  when: es_heap_size is not defined
+    log_es_heap_size: "{% if ((ansible_memory_mb.real.total/(2*1024))|int) > 26 %}26g{% else %}{{(((ansible_memory_mb.real.total/(2*1024))+1)|int)}}g{% endif %}"
+  when: log_es_heap_size is not defined
 
 - name: Copy jvm.options File for Instance
   become: yes

ansible/roles/log-es6/tasks/elasticsearch-parameters.yml

@@ -23,7 +23,7 @@
 #If the user attempts to lock memory they must specify a heap size
 - name: fail when heap size is not specified when using memory lock
   fail: msg="If locking memory with bootstrap.memory_lock a heap size must be specified"
-  when: es_config['bootstrap.memory_lock'] is defined and es_config['bootstrap.memory_lock'] == True and es_heap_size is not defined
+  when: es_config['bootstrap.memory_lock'] is defined and es_config['bootstrap.memory_lock'] == True and log_es_heap_size is not defined
 
 #Check if working with security we have an es_api_basic_auth_username and es_api_basic_auth_username - otherwise any http calls wont work
 - name: fail when api credentials are not declared when using security

ansible/roles/log-es6/templates/environment.j2

+JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
+ES_PATH_CONF=/etc/elasticsearch/{{ansible_hostname}}/

ansible/roles/log-es6/templates/jvm.options.j2

@@ -18,9 +18,9 @@
 
 # Xms represents the initial size of total heap space
 # Xmx represents the maximum size of total heap space
-{% if es_heap_size is defined %}
--Xms{{ log-es_heap_size }}
--Xmx{{ log-es_heap_size }}
+{% if log_es_heap_size is defined %}
+-Xms{{ log_es_heap_size }}
+-Xmx{{ log_es_heap_size }}
 {% else %}
 -Xms2g
 -Xmx2g

ansible/roles/openjdk/tasks/main.yml

 - name: installing repo for open jdk in Ubuntu
   apt_repository: repo='ppa:openjdk-r/ppa'
 
-- name: ensure oracle jdk 8 is absent
-  apt: name='oracle-java8-installer' state=absent
-
 - name: ensure oracle jdk 8 set default is absent
   apt: name='oracle-java8-set-default' state=absent
 
-- name: ensure oracle jdk 8 set default is absent
-  apt: name='openjdk-8-jre-headless' state=absent
-
 - name: ensure openjdk 8 is present
   apt: name='openjdk-8-jre-headless={{ java_version }}' state=present