From c743695bbc595b86937993547c0d6a285cbf8c9d Mon Sep 17 00:00:00 2001 From: Adrien Waksberg Date: Thu, 15 Feb 2024 11:24:47 +0100 Subject: [PATCH] chore: replace apt_key to get_url --- CHANGELOG.md | 1 + README.md | 1 - meta/main.yml | 1 - molecule/default/molecule.yml | 9 --------- tasks/main.yml | 9 +++++++-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09d44b4..eadd183 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/) ### Removed - test: remove support debian 10 +- test: remove support debian 11 ## v1.1.0 - 2021-08-24 diff --git a/README.md b/README.md index 31572e9..1a05a4f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Install and configure logstash * Ansible >= 2.9 * Debian - * Bullseye * Bookworm ## Role variables diff --git a/meta/main.yml b/meta/main.yml index 3b3e3c7..d0082e9 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,7 +11,6 @@ galaxy_info: platforms: - name: Debian versions: - - bullseye - bookworm galaxy_tags: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 58f7769..89bf10a 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -11,15 +11,6 @@ platforms: command: /bin/systemd capabilities: - SYS_ADMIN - - name: debian11 - image: nishiki/debian11:molecule - privileged: true - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host - command: /bin/systemd - capabilities: - - SYS_ADMIN lint: | set -e yamllint . diff --git a/tasks/main.yml b/tasks/main.yml index 3cb6767..3703240 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -8,13 +8,18 @@ tags: logstash - name: Add repository key - ansible.builtin.apt_key: + ansible.builtin.get_url: url: https://artifacts.elastic.co/GPG-KEY-elasticsearch + dest: /etc/apt/keyrings/elastic.asc + checksum: sha256:db52809c5f6b27f9c2bed45cb43e398c659275f3d35305653c6750a0db90f5eb tags: logstash - name: Add repository ansible.builtin.apt_repository: - repo: "deb https://artifacts.elastic.co/packages/{{ logstash_major_version }}.x/apt stable main" + repo: > + deb [signed-by=/etc/apt/keyrings/elastic.asc] + https://artifacts.elastic.co/packages/{{ logstash_major_version }}.x/apt stable main + filename: elastic tags: logstash - name: Install package