Skip to content

Commit

Permalink
Merge pull request #6 from Oefenweb/pr-5
Browse files Browse the repository at this point in the history
Fix installation
  • Loading branch information
tersmitten authored Aug 22, 2023
2 parents 1d9daff + c3b096c commit dedb184
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
1 change: 1 addition & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
warn_list:
- role-name
- name[play]
- name[casing]
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
9 changes: 9 additions & 0 deletions tasks/repository.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-old-public-key

- name: repository | add public key
ansible.builtin.apt_key:
id: "{{ item.id }}"
Expand Down
8 changes: 6 additions & 2 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ grafana_dependencies_pre:
- dirmngr
- apt-transport-https

grafana_apt_keys:
grafana_old_apt_keys:
- id: 8C8C34C524098CB6
keyserver: keyserver.ubuntu.com

grafana_apt_keys:
- id: 9E439B102CF3C0C6
keyserver: keyserver.ubuntu.com

grafana_repositories:
- type: 'deb [arch=amd64]'
url: 'https://packages.grafana.com/oss/deb stable'
url: 'https://apt.grafana.com stable'
component: main

grafana_dependencies:
Expand Down

0 comments on commit dedb184

Please sign in to comment.