diff --git a/CHANGELOG.md b/CHANGELOG.md index f77509f..7b35a15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/) - bug in user template - add multiple value type in service vars +### Removed + +- test: remove support debian11 + ## v1.0.0 - 2021-08-15 - first version diff --git a/README.md b/README.md index 0bab0ec..534d6f3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Install and configure Icinga2 - Ansible >= 2.9 - Debian - - Bullseye - Bookworm ## Role variables diff --git a/meta/main.yml b/meta/main.yml index c0e3243..caf46f9 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,12 +6,11 @@ galaxy_info: company: Adrien Waksberg description: Install and configure Icinga2 license: Apache2 - min_ansible_version: 2.9 + min_ansible_version: "2.9" platforms: - name: Debian versions: - - bullseye - bookworm galaxy_tags: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 68f5223..e73cc9e 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: code.waks.be/nishiki/molecule:debian11 - 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/base.yml b/tasks/base.yml index 70ba84d..0d2b565 100644 --- a/tasks/base.yml +++ b/tasks/base.yml @@ -9,20 +9,22 @@ until: result is succeeded tags: icinga2 -- name: add key repository - ansible.builtin.apt_key: +- name: Add repository key + ansible.builtin.get_url: url: https://packages.icinga.com/icinga.key - retries: 2 - register: result - until: result is succeeded + dest: /etc/apt/keyrings/icinga.asc + owner: root + group: root + mode: 0644 + checksum: sha256:be677e07972ed57b99ffc2fd211379ac11b9c6a7c8d9460086b447b96b0a82bb tags: icinga2 -- name: add repository +- name: Add repository ansible.builtin.apt_repository: - repo: 'deb https://packages.icinga.com/debian icinga-{{ ansible_distribution_release }} main' - retries: 2 - register: result - until: result is succeeded + repo: >- + deb [signed-by=/etc/apt/keyrings/icinga.asc] + https://packages.icinga.com/debian icinga-{{ ansible_distribution_release }} main + filename: icinga tags: icinga2 - name: install packages