De-duplicate elasticsearch apt repos

11 files changed, 59 insertions, 131 deletions

diff --git a/roles/elasticsearch-repos/README.md b/roles/elasticsearch-repos/README.md
new file mode 100644
index 0000000..7da91d0
--- /dev/null
+++ b/roles/elasticsearch-repos/README.md
@@ -0,0 +1,3 @@
+# Role "elasticsearch-repos"
+
+This role installs and configures the elasticsearch APT repositories.
diff --git a/roles/elasticsearch-repos/handlers/main.yml b/roles/elasticsearch-repos/handlers/main.yml
new file mode 100644
index 0000000..2111644
--- /dev/null
+++ b/roles/elasticsearch-repos/handlers/main.yml
@@ -0,0 +1,5 @@
+- name: apt update
+  apt:
+    update_cache: true
+  tags:
+    - role::elasticsearch-repos
diff --git a/roles/elasticsearch-repos/tasks/main.yml b/roles/elasticsearch-repos/tasks/main.yml
new file mode 100644
index 0000000..a76ad43
--- /dev/null
+++ b/roles/elasticsearch-repos/tasks/main.yml
@@ -0,0 +1,31 @@
+---
+- name: Install GPG
+  package:
+    name: gpg
+    state: present
+  tags:
+    - role::elasticsearch-repos
+
+- 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-repos
+
+- 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-repos
+  notify:
+    - apt update
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
 
diff --git a/roles/filebeat/meta/main.yml b/roles/filebeat/meta/main.yml
new file mode 100644
index 0000000..e9d04b1
--- /dev/null
+++ b/roles/filebeat/meta/main.yml
@@ -0,0 +1,5 @@
+---
+dependencies:
+  - role: elasticsearch-repos
+    tags:
+      - role::filebeat
diff --git a/roles/filebeat/tasks/main.yml b/roles/filebeat/tasks/main.yml
index 41d44bd..d3001bb 100644
--- a/roles/filebeat/tasks/main.yml
+++ b/roles/filebeat/tasks/main.yml
@@ -1,39 +1,8 @@
 ---
-- name: Install GPG
-  package:
-    name: gpg
-    state: present
-  tags:
-    - role::filebeat
-
-- 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::filebeat
-
-- 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::filebeat
-  register: add_filebeat_repo
-
 - name: Install Filebeat
   apt:
     pkg: filebeat
     state: present
-    update_cache: "{{ add_filebeat_repo.changed }}"
   tags:
     - role::filebeat
 
diff --git a/roles/kibana/meta/main.yml b/roles/kibana/meta/main.yml
new file mode 100644
index 0000000..7d0b403
--- /dev/null
+++ b/roles/kibana/meta/main.yml
@@ -0,0 +1,5 @@
+---
+dependencies:
+  - role: elasticsearch-repos
+    tags:
+      - role::kibana
diff --git a/roles/kibana/tasks/main.yml b/roles/kibana/tasks/main.yml
index 7524f4f..849209a 100644
--- a/roles/kibana/tasks/main.yml
+++ b/roles/kibana/tasks/main.yml
@@ -1,39 +1,8 @@
 ---
-- name: Install GPG
-  package:
-    name: gpg
-    state: present
-  tags:
-    - role::kibana
-
-- 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::kibana
-
-- 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::kibana
-  register: add_kibana_repo
-
 - name: Install Kibana
   apt:
     pkg: kibana
     state: present
-    update_cache: "{{ add_kibana_repo.changed }}"
   tags:
     - role::kibana
 
diff --git a/roles/packetbeat/meta/main.yml b/roles/packetbeat/meta/main.yml
new file mode 100644
index 0000000..0e42a9a
--- /dev/null
+++ b/roles/packetbeat/meta/main.yml
@@ -0,0 +1,5 @@
+---
+dependencies:
+  - role: elasticsearch-repos
+    tags:
+      - role::packetbeat
diff --git a/roles/packetbeat/tasks/main.yml b/roles/packetbeat/tasks/main.yml
index c967ecd..d68ff00 100644
--- a/roles/packetbeat/tasks/main.yml
+++ b/roles/packetbeat/tasks/main.yml
@@ -1,46 +1,8 @@
 ---
-- name: Install libpcap0.8
-  package:
-    name: libpcap0.8
-    state: present
-  tags:
-    - role::packetbeat
-
-- name: Install GPG
-  package:
-    name: gpg
-    state: present
-  tags:
-    - role::packetbeat
-
-- 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::packetbeat
-
-- 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::packetbeat
-  register: add_packetbeat_repo
-
 - name: Install Packetbeat
   apt:
     pkg: packetbeat
     state: present
-    update_cache: "{{ add_packetbeat_repo.changed }}"
   tags:
     - role::packetbeat