From 72c7d4ac71d33c8803120767108c6bf2ffeb2edc Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Tue, 23 Mar 2021 10:34:55 +0100 Subject: [PATCH] Use quay.ceph.io to pull the Ceph Dashboard related images The purpose of this change is just to switch to quay.ceph.io and pull from that location the Ceph Dashboard related images. quay.ceph.io is maintained by the Ceph organization and can be trusted to find the tags that we need. Closes-Bug: #1920873 Change-Id: If5ec5d4fa0d4d835561b5963d244e5172fe82cc8 --- container-images/container_image_prepare_defaults.yaml | 8 ++++---- container-images/tripleo_containers.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml index 10a3b63a1..3a4df1af2 100644 --- a/container-images/container_image_prepare_defaults.yaml +++ b/container-images/container_image_prepare_defaults.yaml @@ -30,18 +30,18 @@ parameter_defaults: ceph_image: daemon ceph_tag: v5.0.7-stable-5.0-octopus-centos-8-x86_64 - ceph_prometheus_namespace: quay.io/prometheus + ceph_prometheus_namespace: quay.ceph.io/prometheus ceph_prometheus_image: prometheus ceph_prometheus_tag: v2.7.2 - ceph_alertmanager_namespace: quay.io/prometheus + ceph_alertmanager_namespace: quay.ceph.io/prometheus ceph_alertmanager_image: alertmanager ceph_alertmanager_tag: v0.16.2 - ceph_node_exporter_namespace: quay.io/prometheus + ceph_node_exporter_namespace: quay.ceph.io/prometheus ceph_node_exporter_image: node-exporter ceph_node_exporter_tag: v0.17.0 - ceph_grafana_namespace: quay.io/tripleo + ceph_grafana_namespace: quay.ceph.io/app-sre ceph_grafana_image: grafana ceph_grafana_tag: 6.7.4 diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml index 16b9e879a..9e797db6e 100644 --- a/container-images/tripleo_containers.yaml +++ b/container-images/tripleo_containers.yaml @@ -177,13 +177,13 @@ container_images: image_source: tripleo - imagename: quay.ceph.io/ceph-ci/daemon:v5.0.7-stable-5.0-octopus-centos-8-x86_64 image_source: ceph -- imagename: quay.io/prometheus/prometheus:v2.7.2 +- imagename: quay.ceph.io/prometheus/prometheus:v2.7.2 image_source: prom -- imagename: quay.io/prometheus/alertmanager:v0.16.2 +- imagename: quay.ceph.io/prometheus/alertmanager:v0.16.2 image_source: prom -- imagename: quay.io/prometheus/node-exporter:v0.17.0 +- imagename: quay.ceph.io/prometheus/node-exporter:v0.17.0 image_source: prom -- imagename: quay.io/tripleo/grafana:6.7.4 +- imagename: quay.ceph.io/app-sre/grafana:6.7.4 image_source: grafana - imagename: quay.io/tripleomaster/openstack-rsyslog:current-tripleo image_source: tripleo