From bdbd7d033afef3841ac7958152d0673d1f4c4634 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Fri, 4 Aug 2023 15:58:53 +0200 Subject: [PATCH 1/6] Fix installation --- vars/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/main.yml b/vars/main.yml index 5ffe8e8..9d2b861 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -6,12 +6,12 @@ grafana_dependencies_pre: - apt-transport-https grafana_apt_keys: - - id: 8C8C34C524098CB6 - keyserver: keyserver.ubuntu.com + - id: 0E22EB88E39E12277A7760AE9E439B102CF3C0C6 + keyserver: https://apt.grafana.com/gpg.key grafana_repositories: - type: 'deb [arch=amd64]' - url: 'https://packages.grafana.com/oss/deb stable' + url: 'https://apt.grafana.com stable' component: main grafana_dependencies: From b360609a1645d61bcf4c0f065cdafc02cbf7874c Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Fri, 4 Aug 2023 16:02:27 +0200 Subject: [PATCH 2/6] Fix installation --- vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/main.yml b/vars/main.yml index 9d2b861..debd4a7 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -10,7 +10,7 @@ grafana_apt_keys: keyserver: https://apt.grafana.com/gpg.key grafana_repositories: - - type: 'deb [arch=amd64]' + - type: deb url: 'https://apt.grafana.com stable' component: main From 50c800ee960444ef81d4efde9c6377e3ace2eafd Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Fri, 4 Aug 2023 16:15:29 +0200 Subject: [PATCH 3/6] Fix installation --- tasks/repository.yml | 9 +++++++++ vars/main.yml | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tasks/repository.yml b/tasks/repository.yml index f70cb30..45158fa 100644 --- a/tasks/repository.yml +++ b/tasks/repository.yml @@ -9,6 +9,15 @@ tags: - grafana-repository-dependencies +- name: repository | remove old public key + ansible.builtin.apt_key: + id: "{{ item.id }}" + keyserver: "{{ item.keyserver }}" + state: absent + with_items: "{{ grafana_old_apt_keys }}" + tags: + - grafana-repository-public-key + - name: repository | add public key ansible.builtin.apt_key: id: "{{ item.id }}" diff --git a/vars/main.yml b/vars/main.yml index debd4a7..58acb0e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -5,9 +5,13 @@ grafana_dependencies_pre: - dirmngr - apt-transport-https +grafana_old_apt_keys: + - id: 8C8C34C524098CB6 + keyserver: keyserver.ubuntu.com + grafana_apt_keys: - - id: 0E22EB88E39E12277A7760AE9E439B102CF3C0C6 - keyserver: https://apt.grafana.com/gpg.key + - id: 225E6A9BBB15A37E95EB6312C66A51CCB44C27E0 + keyserver: keyserver.ubuntu.com grafana_repositories: - type: deb From 2235866306cbb6adc23e68814f3420c899bc4bd4 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Fri, 4 Aug 2023 16:22:13 +0200 Subject: [PATCH 4/6] Fix installation --- tasks/repository.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/repository.yml b/tasks/repository.yml index 45158fa..d6191c7 100644 --- a/tasks/repository.yml +++ b/tasks/repository.yml @@ -16,7 +16,7 @@ state: absent with_items: "{{ grafana_old_apt_keys }}" tags: - - grafana-repository-public-key + - grafana-repository-old-public-key - name: repository | add public key ansible.builtin.apt_key: From fab84c01fd63aa507b887b70b506a327ee30d5d9 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Thu, 10 Aug 2023 13:09:30 +0200 Subject: [PATCH 5/6] Consistency changes --- .ansible-lint | 1 + .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.ansible-lint b/.ansible-lint index 7e0172a..b04781e 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,4 +1,5 @@ --- warn_list: - role-name + - name[play] - name[casing] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f7278a..7e2bc34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: python-version: '3.x' - name: Install test dependencies - run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker + run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker - name: Run Molecule tests run: | From c3b096c8d17e79996a06b4d294a4745ca00a5ced Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Tue, 22 Aug 2023 11:41:25 +0200 Subject: [PATCH 6/6] Backport --- vars/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/main.yml b/vars/main.yml index 58acb0e..b899d2d 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -10,11 +10,11 @@ grafana_old_apt_keys: keyserver: keyserver.ubuntu.com grafana_apt_keys: - - id: 225E6A9BBB15A37E95EB6312C66A51CCB44C27E0 + - id: 9E439B102CF3C0C6 keyserver: keyserver.ubuntu.com grafana_repositories: - - type: deb + - type: 'deb [arch=amd64]' url: 'https://apt.grafana.com stable' component: main