De-duplicate elasticsearch apt repos

2 files changed, 5 insertions, 31 deletions

diff --git a/roles/elasticsearch/meta/main.yml b/roles/elasticsearch/meta/main.yml
new file mode 100644
index 0000000..91796da
--- /dev/null
+++ b/roles/elasticsearch/meta/main.yml
@@ -0,0 +1,5 @@
+---
+dependencies:
+  - role: elasticsearch-repos
+    tags:
+      - role::elasticsearch
diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml
index 265c7c2..9a69b24 100644
--- a/roles/elasticsearch/tasks/main.yml
+++ b/roles/elasticsearch/tasks/main.yml
@@ -1,39 +1,8 @@
 ---
-- name: Install GPG
-  package:
-    name: gpg
-    state: present
-  tags:
-    - role::elasticsearch
-
-- name: Install Elasticsearch signing key
-  # noqa command-instead-of-module
-  shell: >-
-    set -o pipefail && wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch |
-    gpg --yes --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg
-  args:
-    creates: /usr/share/keyrings/elasticsearch-keyring.gpg
-  tags:
-    - role::elasticsearch
-
-- name: Add Elasticsearch repository to apt
-  copy:
-    content: >-
-      deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg]
-      https://artifacts.elastic.co/packages/8.x/apt stable main
-    dest: /etc/apt/sources.list.d/elastic-8.x.list
-    owner: root
-    group: root
-    mode: 0644
-  tags:
-    - role::elasticsearch
-  register: add_elastic_repo
-
 - name: Install Elasticsearch
   apt:
     pkg: elasticsearch
     state: present
-    update_cache: "{{ add_elastic_repo.changed }}"
   tags:
     - role::elasticsearch