From 2834abc140b2b4bed6c348fcd8f7c7d93f7ee2a5 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 5 Aug 2019 12:06:32 +0200 Subject: [PATCH] grafana: Change the repository URL. Fix the apt: tasks. --- library/roles/grafana/defaults/main.yml | 4 ++-- library/roles/grafana/tasks/main.yml | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/library/roles/grafana/defaults/main.yml b/library/roles/grafana/defaults/main.yml index 3ec3915b..458b5484 100644 --- a/library/roles/grafana/defaults/main.yml +++ b/library/roles/grafana/defaults/main.yml @@ -1,6 +1,6 @@ --- -grafana_repo_key: https://packagecloud.io/gpg.key -grafana_repo: 'deb https://packagecloud.io/grafana/testing/debian/ wheezy main' +grafana_repo_key: https://packages.grafana.com/gpg.key +grafana_repo: 'deb https://packages.grafana.com/oss/deb stable main' grafana_pkg_state: latest grafana_packages: - grafana diff --git a/library/roles/grafana/tasks/main.yml b/library/roles/grafana/tasks/main.yml index 481af82f..8a30f1e6 100644 --- a/library/roles/grafana/tasks/main.yml +++ b/library/roles/grafana/tasks/main.yml @@ -4,8 +4,7 @@ service: name=grafana-server state=stopped enabled=no - name: Remove the grafana deb packages - apt: name='{{ item }}' state=absent - with_items: '{{ grafana_packages }}' + apt: name={{ grafana_packages }} state=absent - name: Install the grafana deb repository apt_repository: repo='{{ grafana_repo }}' state=absent update_cache=yes @@ -21,8 +20,7 @@ apt_repository: repo='{{ grafana_repo }}' state=present update_cache=yes - name: Install the grafana deb packages - apt: name='{{ item }}' state={{ grafana_pkg_state }} update_cache=yes cache_valid_time=1800 - with_items: '{{ grafana_packages }}' + apt: name={{ grafana_packages }} state={{ grafana_pkg_state }} update_cache=yes cache_valid_time=1800 - name: Install the grafana configuration files template: src={{ item }}.j2 dest=/etc/grafana/{{ item }} mode=0440 owner=root group=grafana