From ae234d0fb173ad1c0c79ea9bc0f207cf6d37089d Mon Sep 17 00:00:00 2001 From: dnssmr Date: Mon, 22 May 2023 13:11:10 +0200 Subject: [PATCH 1/2] fixing gpg dependency Added task to install gpg if its not instaklled already --- roles/repos/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/repos/tasks/main.yml b/roles/repos/tasks/main.yml index e0f2d5fe..60b57183 100644 --- a/roles/repos/tasks/main.yml +++ b/roles/repos/tasks/main.yml @@ -7,6 +7,11 @@ - elasticstack_release | int > 7 - elasticstack_variant == "oss" +- name: Ensure gpg exists, for signing keys + ansible.builtin.package: + name: gpg + state: present + - name: Import RedHat tasks import_tasks: redhat.yml when: ansible_os_family == 'RedHat' From 888805414a2388715247a836cfa4000a76db3b80 Mon Sep 17 00:00:00 2001 From: dnssmr Date: Mon, 22 May 2023 14:54:19 +0200 Subject: [PATCH 2/2] Fixed gpg dependency - added os-specific package names --- roles/repos/tasks/debian.yml | 5 +++++ roles/repos/tasks/main.yml | 5 ----- roles/repos/tasks/redhat.yml | 5 +++++ roles/repos/tasks/suse.yml | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/roles/repos/tasks/debian.yml b/roles/repos/tasks/debian.yml index 8225be05..463d940b 100644 --- a/roles/repos/tasks/debian.yml +++ b/roles/repos/tasks/debian.yml @@ -1,4 +1,9 @@ --- +- name: Ensure gpg exists, for signing keys + ansible.builtin.apt: + name: gpg + state: present + - name: Ensure Elastic Stack key is available (Debian) ansible.builtin.apt_key: url: https://artifacts.elastic.co/GPG-KEY-elasticsearch diff --git a/roles/repos/tasks/main.yml b/roles/repos/tasks/main.yml index 60b57183..e0f2d5fe 100644 --- a/roles/repos/tasks/main.yml +++ b/roles/repos/tasks/main.yml @@ -7,11 +7,6 @@ - elasticstack_release | int > 7 - elasticstack_variant == "oss" -- name: Ensure gpg exists, for signing keys - ansible.builtin.package: - name: gpg - state: present - - name: Import RedHat tasks import_tasks: redhat.yml when: ansible_os_family == 'RedHat' diff --git a/roles/repos/tasks/redhat.yml b/roles/repos/tasks/redhat.yml index 141a13be..84255e86 100644 --- a/roles/repos/tasks/redhat.yml +++ b/roles/repos/tasks/redhat.yml @@ -3,6 +3,11 @@ # See https://github.com/elastic/elasticsearch/issues/85876 # for more information why this is needed +- name: Ensure gpg exists, for signing keys + ansible.builtin.yum: + name: gnupg + state: present + - name: Workaround for EL > 8 when: - ansible_distribution_major_version >= "9" diff --git a/roles/repos/tasks/suse.yml b/roles/repos/tasks/suse.yml index e907e3a2..ae9d1ead 100644 --- a/roles/repos/tasks/suse.yml +++ b/roles/repos/tasks/suse.yml @@ -1,5 +1,10 @@ --- +- name: Ensure gpg exists, for signing keys + community.general.zypper: + name: gpg2 + state: present + - name: Ensure Elastic Stack yum repository is configured (SuSE) community.general.zypper_repository: name: elastic-{{ elasticstack_release }}.x