Fix grafana repo
Grafana repository is moved from packagecloud to
packages.grafana.com[0]. Based on new grafana install guide[1], update
the grafana.repo
[0] https://grafana.com/blog/2019/01/05/moving-to-packages.grafana.com/
[1] http://docs.grafana.org/installation/rpm/#install-via-yum-repository
Closes-Bug: #1810867
Change-Id: Ib065fdc561b72fc013b952b3df41ee83b083194e
(cherry picked from commit ae88344025
)
This commit is contained in:
parent
3a4374394d
commit
d4464fa4d9
|
@ -84,7 +84,7 @@ RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
|
|||
'https://packages.elastic.co/GPG-KEY-elasticsearch',
|
||||
'https://repos.influxdata.com/influxdb.key',
|
||||
'https://packagecloud.io/gpg.key',
|
||||
'https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana',
|
||||
'https://packages.grafana.com/gpg.key',
|
||||
'https://packages.treasuredata.com/GPG-KEY-td-agent'
|
||||
] %}
|
||||
{% endif %}
|
||||
|
@ -339,7 +339,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
|
|||
{# 05CE15085FC09D18E99EFB22684A14CF2582E0C5 -- InfluxDB Packaging Service <support@influxdb.com> #}
|
||||
{# 177F4010FE56CA3336300305F1656F24C74CD1D8 -- MariaDB Signing Key <signing-key@mariadb.org> #}
|
||||
{# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #}
|
||||
{# 418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB -- packagecloud ops (production key) <ops@packagecloud.io> #}
|
||||
{# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #}
|
||||
{# 49B07274951063870A8B7EAE7B8AA1A344C05248 -- Opendaylight Signing Key <https://launchpad.net/~odl-team> #}
|
||||
{# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #}
|
||||
|
@ -351,7 +350,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
|
|||
'05CE15085FC09D18E99EFB22684A14CF2582E0C5',
|
||||
'177F4010FE56CA3336300305F1656F24C74CD1D8',
|
||||
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
|
||||
'418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
|
||||
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
|
||||
'49B07274951063870A8B7EAE7B8AA1A344C05248',
|
||||
'4D1BB29D63D98E422B2113B19334A25F8507EFA5',
|
||||
|
@ -361,6 +359,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
|
|||
'A20F259AEB9C94BB'
|
||||
] %}
|
||||
{% set remote_apt_keys = [
|
||||
'https://packages.grafana.com/gpg.key'
|
||||
] %}
|
||||
{% elif base_distro == 'debian' %}
|
||||
{% set base_apt_keys = [
|
||||
|
@ -368,12 +367,12 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
|
|||
'0xcbcb082a1bb943db',
|
||||
'D27D666CD88E42B4',
|
||||
'05CE15085FC09D18E99EFB22684A14CF2582E0C5',
|
||||
'418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
|
||||
'901F9177AB97ACBE',
|
||||
] %}
|
||||
{% set remote_apt_keys = [
|
||||
'http://obs.linaro.org/ERP:/kolla:/queens/Debian_9/Release.key',
|
||||
'https://bintray.com/user/downloadSubjectPublicKey?username=bintray',
|
||||
'https://packages.grafana.com/gpg.key'
|
||||
] %}
|
||||
{% set base_apt_packages = base_apt_packages +
|
||||
['sudo',]
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
[grafana]
|
||||
name=grafana
|
||||
baseurl=https://packagecloud.io/grafana/stable/el/7/$basearch
|
||||
baseurl=https://packages.grafana.com/oss/rpm
|
||||
repo_gpgcheck=1
|
||||
enabled=1
|
||||
gpgcheck=1
|
||||
gpgkey=https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana
|
||||
gpgkey=https://packages.grafana.com/gpg.key
|
||||
sslverify=1
|
||||
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
|
||||
|
|
|
@ -8,8 +8,8 @@ deb http://security.debian.org stretch/updates main
|
|||
# ceph, dpdk, kibana, libvirt, nodejs, opendayligh, openvswitch, qemu
|
||||
deb http://obs.linaro.org/ERP:/kolla:/queens/Debian_9/ ./
|
||||
|
||||
deb [arch=amd64] https://packagecloud.io/grafana/stable/debian/ stretch main
|
||||
#
|
||||
deb https://packages.grafana.com/oss/deb stable main
|
||||
|
||||
# Unofficial repository for grafana (LP: #1768585).
|
||||
deb [arch=arm64] https://dl.bintray.com/fg2it/deb-arm64/ stretch main
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ deb http://apt.dockerproject.org/repo ubuntu-xenial main
|
|||
deb https://repos.influxdata.com/ubuntu xenial stable
|
||||
|
||||
# Grafana repo
|
||||
deb https://packagecloud.io/grafana/stable/debian/ jessie main
|
||||
deb https://packages.grafana.com/oss/deb stable main
|
||||
|
||||
# Nfs-ganesha repo
|
||||
deb http://download.ceph.com/nfs-ganesha/deb-V2.5-stable/luminous xenial main
|
||||
|
|
Loading…
Reference in New Issue