diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-08 01:34:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-08 01:34:40 +0000 |
| commit | 43e0b27c18eb19ebe84dc0716b43f5ceb42a39c2 (patch) | |
| tree | e16717e421e22d6cdc80968ae71f428e5ad666e4 /kolla | |
| parent | 16f27c549660c4c27e3f440578ea1cf05b772a90 (diff) | |
| parent | 9ea0725dacdb8f0b69d899b8461f82d9b21ab1dd (diff) | |
| download | kolla-43e0b27c18eb19ebe84dc0716b43f5ceb42a39c2.tar.gz kolla-43e0b27c18eb19ebe84dc0716b43f5ceb42a39c2.zip | |
Merge "grafana: update urls"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/template/repos.yaml | 8 | ||||
| -rw-r--r-- | kolla/tests/test_methods.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 3aed5d405..84f8bbd8b 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -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" diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index 39ef20c64..9574bb382 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -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 && " |