Merge pull request #9 from punktDe/deb822

Set default version to 8, switch to deb822 repo scheme

Author: medanthelinium

defaults/main.yaml

@@ -2,7 +2,7 @@
 elasticsearch:
   use_dehydrated: no
   domain: "{{ inventory_hostname }}"
-  version: 7
+  version: 8
   users:
     builtin:
       elastic:
@@ -68,6 +68,6 @@ elasticsearch:
   repository:
     apt:
       key_url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
-      repository: deb https://artifacts.elastic.co/packages/{{ vars.elasticsearch.version }}.x/apt stable main
+      repository: https://artifacts.elastic.co/packages/{{ vars.elasticsearch.version }}.x/apt
   plugins: {}
   http_proxy:

tasks/config.yaml

@@ -1,4 +1,9 @@
 ---
+- name: Enable elasticsearch service
+  service:
+    name: elasticsearch
+    enabled: yes
+
 - name: Template Elasticsearch configuration
   template:
     src: "{{ item }}"

tasks/install.yaml

@@ -1,34 +1,39 @@
-- when: ansible_os_family == 'Debian'
-  block:
-    - name: Add Elastic repository key
-      apt_key:
-        url: "{{ elasticsearch.repository.apt.key_url }}"
+---
+- name: Install python3-debian package with apt
+  ansible.builtin.apt:
+    name: python3-debian
+    update_cache: yes
 
-    - name: Add Elastic repository
-      loop:
-        - /etc/apt/sources.list.d/elastic.list
-      copy:
-        content: |
-          {{ elasticsearch.repository.apt.repository }}
-        dest: "{{ item }}"
-      register: elasticsearch_add_apt_repository
-
-    - name: Update apt cache
-      when: elasticsearch_add_apt_repository.changed
-      apt:
-        update_cache: yes
+- name: Remove the legacy apt repository
+  ansible.builtin.file:
+    dest: /etc/apt/sources.list.d/elastic.list
+    state: absent
+      
+- name: Add the elasticsearch apt repository
+  register: elasticsearch_repository_added
+  ansible.builtin.deb822_repository:
+    name: elastic
+    uris: "{{ elasticsearch.repository.apt.repository }}"
+    signed_by: "{{ elasticsearch.repository.apt.key_url }}"
+    types: [deb]
+    components: [main]
+    suites: [stable]
+    state: present
+    enabled: yes
 
-    - name: Install Elasticsearch
-      apt:
-        name: elasticsearch
+- name: Update apt cache
+  when: elasticsearch_repository_added.changed
+  ansible.builtin.apt:
+    update_cache: yes
 
-    - name: Restart Elasticsearch after package upgrade
-      lineinfile:
-        path: /etc/default/elasticsearch
-        regexp: '^#?RESTART_ON_UPGRADE='
-        line: RESTART_ON_UPGRADE=true
+- name: Restart Elasticsearch after package upgrade
+  lineinfile:
+    path: /etc/default/elasticsearch
+    regexp: '^#?RESTART_ON_UPGRADE='
+    line: RESTART_ON_UPGRADE=true
 
-- name: Enable Elasticsearch
-  service:
+- name: Install Elasticsearch
+  when: ansible_os_family == 'Debian'
+  notify: Restart Elasticsearch
+  ansible.builtin.apt:
     name: elasticsearch
-    enabled: yes

tasks/main.yaml

@@ -1,5 +1,6 @@
 ---
 - import_tasks: install.yaml
+  when: ansible_os_family == "Debian"
 - import_tasks: transport_security.yaml
 - import_tasks: config.yaml
 - import_tasks: service.yaml