From: Dimitri Savineau Date: Tue, 8 Sep 2020 14:36:20 +0000 (-0400) Subject: tests: use grafana from quay.io X-Git-Tag: v6.0.0alpha2~47 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98c9afceb936753ebcf3f2c036b73fedbdfa6e3d;p=ceph-ansible.git tests: use grafana from quay.io This changes the grafana container image regitry from docker.io to quay.io to avoid rate limit. This also adds the missing container image values for docker2podman and podman scenarios. Signed-off-by: Dimitri Savineau --- diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index 6b03b9873..f063fb53c 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -47,4 +47,5 @@ ceph_docker_image: ceph-ci/daemon ceph_docker_image_tag: latest-master node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" -alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" \ No newline at end of file +alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" +grafana_container_image: "quay.io/app-sre/grafana:5.4.3" \ No newline at end of file diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all index 863eeb556..733ffff69 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -38,4 +38,5 @@ grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.ceph.io node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" -alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" \ No newline at end of file +alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" +grafana_container_image: "quay.io/app-sre/grafana:5.4.3" diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all index 2e830100c..0d1395a50 100644 --- a/tests/functional/collocation/container/group_vars/all +++ b/tests/functional/collocation/container/group_vars/all @@ -29,4 +29,5 @@ ceph_docker_image: ceph-ci/daemon ceph_docker_image_tag: latest-master node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" -alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" \ No newline at end of file +alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" +grafana_container_image: "quay.io/app-sre/grafana:5.4.3" \ No newline at end of file diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all index 7769163f2..22368bd01 100644 --- a/tests/functional/collocation/group_vars/all +++ b/tests/functional/collocation/group_vars/all @@ -23,4 +23,5 @@ dashboard_admin_user_ro: true grafana_admin_password: +xFRe+RES@7vg24n node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" -alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" \ No newline at end of file +alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" +grafana_container_image: "quay.io/app-sre/grafana:5.4.3" diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all index 94dc7ae76..0c808852d 100644 --- a/tests/functional/docker2podman/group_vars/all +++ b/tests/functional/docker2podman/group_vars/all @@ -46,4 +46,8 @@ dashboard_admin_password: $sX!cD$rYU6qR^B! grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.ceph.io ceph_docker_image: ceph-ci/daemon -ceph_docker_image_tag: latest-master \ No newline at end of file +ceph_docker_image_tag: latest-master +node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" +prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" +alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" +grafana_container_image: "quay.io/app-sre/grafana:5.4.3" \ No newline at end of file diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all index 775343adc..85106395a 100644 --- a/tests/functional/podman/group_vars/all +++ b/tests/functional/podman/group_vars/all @@ -45,4 +45,8 @@ dashboard_admin_password: $sX!cD$rYU6qR^B! grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.ceph.io ceph_docker_image: ceph-ci/daemon -ceph_docker_image_tag: latest-master \ No newline at end of file +ceph_docker_image_tag: latest-master +node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0" +prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2" +alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" +grafana_container_image: "quay.io/app-sre/grafana:5.4.3" \ No newline at end of file