From f8e88003e1792ef5e1136954fbcb7bb60f9ff3ee Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 14:16:58 +0100 Subject: [PATCH 01/12] update key id debian repo changed and thus key changed --- tasks/install.deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/install.deb.yml b/tasks/install.deb.yml index 2c95bc3..c24ddad 100644 --- a/tasks/install.deb.yml +++ b/tasks/install.deb.yml @@ -4,7 +4,7 @@ apt: name="apt-transport-https" - name: grafana-install | Add debian repository pt. 1 - apt_key: url='{{grafana_apt_key}}' id=D59097AB + apt_key: url='{{grafana_apt_key}}' id=id=0D224E82057BCEE1321424B1CA6D481DBD044C76 - name: grafana-install | Add debian repository pt. 2 apt_repository: repo='{{grafana_apt_repository}}' From c7935355f3fb45a6852451a063effed53bab82ee Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 14:18:49 +0100 Subject: [PATCH 02/12] update repos grafana debian repo changed --- defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 210d128..bd53d70 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,8 +1,8 @@ --- grafana_enabled: true # The role is enabled -grafana_apt_repository: deb https://packagecloud.io/grafana/stable/debian/ jessie main -grafana_apt_key: https://packagecloud.io/gpg.key +grafana_apt_repository: deb https://packages.grafana.com/oss/deb stable main +grafana_apt_key: https://packages.grafana.com/gpg.key grafana_version: 4.1.2-* # Set version (set to latest to install latest version) From 6768812ecfb012a441bc3c5f63eab553c103d1d8 Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 14:25:05 +0100 Subject: [PATCH 03/12] fix key id fixes paste error --- tasks/install.deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/install.deb.yml b/tasks/install.deb.yml index c24ddad..546b00d 100644 --- a/tasks/install.deb.yml +++ b/tasks/install.deb.yml @@ -4,7 +4,7 @@ apt: name="apt-transport-https" - name: grafana-install | Add debian repository pt. 1 - apt_key: url='{{grafana_apt_key}}' id=id=0D224E82057BCEE1321424B1CA6D481DBD044C76 + apt_key: url='{{grafana_apt_key}}' id=0D224E82057BCEE1321424B1CA6D481DBD044C76 - name: grafana-install | Add debian repository pt. 2 apt_repository: repo='{{grafana_apt_repository}}' From f1f764035f86b374e78f57b133f1fee69531e797 Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 14:29:08 +0100 Subject: [PATCH 04/12] require newer python for tests Otherwise tests just fail. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ed3488..3b46333 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- language: python -python: "2.7" +python: "2.7.9" before_install: - sudo apt-get update -qq - sudo apt-get install -qq python-apt python-pycurl From 60eefa84e90e1a457de5ce9eb33d1282f095f7c6 Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 14:36:19 +0100 Subject: [PATCH 05/12] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b46333..3ed3488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- language: python -python: "2.7.9" +python: "2.7" before_install: - sudo apt-get update -qq - sudo apt-get install -qq python-apt python-pycurl From 2b0d13f380eb05bceac778e0be57e813dde26548 Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 14:36:35 +0100 Subject: [PATCH 06/12] Update install.deb.yml --- tasks/install.deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/install.deb.yml b/tasks/install.deb.yml index 546b00d..894cda0 100644 --- a/tasks/install.deb.yml +++ b/tasks/install.deb.yml @@ -4,7 +4,7 @@ apt: name="apt-transport-https" - name: grafana-install | Add debian repository pt. 1 - apt_key: url='{{grafana_apt_key}}' id=0D224E82057BCEE1321424B1CA6D481DBD044C76 + apt_key: url='{{grafana_apt_key}}' id=0D224E82057BCEE1321424B1CA6D481DBD044C76 validate_certs=False - name: grafana-install | Add debian repository pt. 2 apt_repository: repo='{{grafana_apt_repository}}' From 1f7abfd2f496a8a7d0bd55add71c079dd4ce3a63 Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 14:52:48 +0100 Subject: [PATCH 07/12] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3ed3488..1c90b4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ python: "2.7" before_install: - sudo apt-get update -qq - sudo apt-get install -qq python-apt python-pycurl + - sudo cat /etc/apt/sources.list + - sudo ls /etc/apt/sources.list.d/* install: - pip install ansible>=1.6.0 From 6774bd1b65b88dc95b0685472073038178a8347c Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 14:56:33 +0100 Subject: [PATCH 08/12] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1c90b4a..9a37d75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ before_install: - sudo apt-get install -qq python-apt python-pycurl - sudo cat /etc/apt/sources.list - sudo ls /etc/apt/sources.list.d/* + - sudo grep packagecloud /etc/apt/sources.list.d/* install: - pip install ansible>=1.6.0 From 9f449fb3015a4201e0d2797200bb16f4cbd52883 Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 15:00:26 +0100 Subject: [PATCH 09/12] Update .travis.yml --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a37d75..14342e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,9 @@ language: python python: "2.7" before_install: - sudo apt-get update -qq - - sudo apt-get install -qq python-apt python-pycurl - - sudo cat /etc/apt/sources.list - - sudo ls /etc/apt/sources.list.d/* - - sudo grep packagecloud /etc/apt/sources.list.d/* + - sudo apt-get install -qq python-apt python-pycur + - grep -l packagecloud /etc/apt/sources.list.d/* | xargs sudo rm + - sudo apt-get update -qq install: - pip install ansible>=1.6.0 From a077552ae45824fc00d3b9d41762e022a399a3cb Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 15:06:23 +0100 Subject: [PATCH 10/12] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14342e3..29dc8b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: python python: "2.7" before_install: - sudo apt-get update -qq - - sudo apt-get install -qq python-apt python-pycur + - sudo apt-get install -qq python-apt python-pycurl - grep -l packagecloud /etc/apt/sources.list.d/* | xargs sudo rm - sudo apt-get update -qq From 8ae357c1bb6838adadb57790190ca9ff959f64f1 Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 15:09:29 +0100 Subject: [PATCH 11/12] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29dc8b4..3ed3488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ python: "2.7" before_install: - sudo apt-get update -qq - sudo apt-get install -qq python-apt python-pycurl - - grep -l packagecloud /etc/apt/sources.list.d/* | xargs sudo rm - - sudo apt-get update -qq install: - pip install ansible>=1.6.0 From 0206426ab258edc80dbd4ea38cf7994600b6d615 Mon Sep 17 00:00:00 2001 From: impca Date: Wed, 23 Jan 2019 15:12:34 +0100 Subject: [PATCH 12/12] Update install.deb.yml --- tasks/install.deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/install.deb.yml b/tasks/install.deb.yml index 894cda0..546b00d 100644 --- a/tasks/install.deb.yml +++ b/tasks/install.deb.yml @@ -4,7 +4,7 @@ apt: name="apt-transport-https" - name: grafana-install | Add debian repository pt. 1 - apt_key: url='{{grafana_apt_key}}' id=0D224E82057BCEE1321424B1CA6D481DBD044C76 validate_certs=False + apt_key: url='{{grafana_apt_key}}' id=0D224E82057BCEE1321424B1CA6D481DBD044C76 - name: grafana-install | Add debian repository pt. 2 apt_repository: repo='{{grafana_apt_repository}}'