openstack/kolla
Code Issues Proposed changes

Merge "grafana: update urls"

Browse Source
This commit is contained in:
Zuul 2023-02-08 01:34:40 +00:00 committed by Gerrit Code Review
commit 43e0b27c18
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -299,7 +299,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{# NOTE(hrw): type field defaults to 'asc' which is used for single keys #}
{% set base_remote_apt_keys = [
{'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'},
{'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'},
{'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
{'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
{'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key'},

4
docker/base/grafana.repo
View File

@ -1,8 +1,8 @@
[grafana]
name=grafana
baseurl=https://packages.grafana.com/oss/rpm
baseurl=https://rpm.grafana.com
enabled=0
gpgcheck=1
gpgkey=https://packages.grafana.com/gpg.key
gpgkey=https://rpm.grafana.com/gpg.key
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt

8
kolla/template/repos.yaml
View File

@ -38,7 +38,7 @@ debian:
component: "main"
gpg_key: "erlang-ppa.gpg"
grafana:
url: "https://packages.grafana.com/oss/deb"
url: "https://apt.grafana.com"
suite: "stable"
component: "main"
gpg_key: "grafana.asc"
@ -75,7 +75,7 @@ debian-aarch64:
component: "main"
gpg_key: "erlang-ppa.gpg"
grafana:
url: "https://packages.grafana.com/oss/deb"
url: "https://apt.grafana.com"
suite: "stable"
component: "main"
gpg_key: "grafana.asc"
@ -144,7 +144,7 @@ ubuntu:
component: "main"
gpg_key: "erlang-ppa.gpg"
grafana:
url: "https://packages.grafana.com/oss/deb"
url: "https://apt.grafana.com"
suite: "stable"
component: "main"
gpg_key: "grafana.asc"
@ -181,7 +181,7 @@ ubuntu-aarch64:
component: "main"
gpg_key: "erlang-ppa.gpg"
grafana:
url: "https://packages.grafana.com/oss/deb"
url: "https://apt.grafana.com"
suite: "stable"
component: "main"
gpg_key: "grafana.asc"

4
kolla/tests/test_methods.py
View File

@ -66,7 +66,7 @@ class MethodsTest(base.TestCase):
}
result = methods.handle_repos(template_vars, ['grafana'], 'enable')
expectCmd = "RUN echo 'Uris: https://packages.grafana.com/oss/deb' "
expectCmd = "RUN echo 'Uris: https://apt.grafana.com' "
expectCmd += ">/etc/apt/sources.list.d/grafana.sources && "
expectCmd += "echo 'Components: main' "
expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
@ -99,7 +99,7 @@ class MethodsTest(base.TestCase):
result = methods.handle_repos(template_vars, ['grafana', 'rabbitmq'],
'enable')
expectCmd = "RUN echo 'Uris: https://packages.grafana.com/oss/deb' "
expectCmd = "RUN echo 'Uris: https://apt.grafana.com' "
expectCmd += ">/etc/apt/sources.list.d/grafana.sources && "
expectCmd += "echo 'Components: main' "
expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "