Merge pull request #18 from Cloud-Temple/develop

Make it work for Ubuntu 20.04 and Es 7.13.2

defaults/main.yml

@@ -1,10 +1,11 @@
 ---
 # Commons parameters for all ELK Stack
 es_major_version: "7.x"
-es_version: "7.11.2"
+es_version: "7.13.2"
 es_use_repository: true
-es_apt_key: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
-es_apt_url: "deb https://artifacts.elastic.co/packages/{{ es_repo_name }}/apt stable main"
+es_repo_base: "https://artifacts.elastic.co"
+es_apt_key: "{{ es_repo_base }}/GPG-KEY-elasticsearch"
+es_apt_url: "deb {{ es_repo_base }}/packages/{{ es_repo_name }}/apt stable main"
 es_apt_url_old: "deb http://packages.elastic.co/elasticsearch/{{ es_repo_name }}/debian stable main"
 #Elasticsearch username and password
 es_user: kibana_system

tasks/kibana-Debian.yml

@@ -17,7 +17,10 @@
 
 - name: Debian - Add Elasticsearch repository key
   become: yes
-  apt_key: url="{{ es_apt_key }}" state=present
+  apt_key:
+    url: "{{ es_apt_key }}"
+    id: "{{ es_apt_key_id }}"
+    state: present
   when: es_use_repository  | bool and es_apt_key is defined | bool
   register: result
   until: result is not failed

vars/Debian.yml

@@ -2,3 +2,4 @@
 java: "{% if es_java is defined %}{{ es_java }}{% else %}openjdk-8-jre-headless{% endif %}"
 kibana_home: "/usr/share/kibana"
 default_file: "/etc/default/kibana"
+es_apt_key_id: "46095ACC8548582C1A2699A9D27D666CD88E42B4"