From e19f2ca12dd3b6b23a5ad77cdbd7e0e526b4bba8 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Tue, 23 Mar 2021 12:22:55 +0530 Subject: [PATCH] Switch to tripleo namespace grafana images We cannot rely on quay app-sre namespace as they removed the image and it blocked all the content provider job. Switching to tripleo/grafana image for the same. Note: It is not a clean cherry-pick as container build method support both kolla and tcib based method, so making changes for both of them. Closes-Bug: #1920873 Signed-off-by: Chandan Kumar (raukadah) Change-Id: I6999e683edd82ef61fba768013b12408851f6f09 (cherry picked from commit e0b0d859efb179c6868020b3fc10c2155ed96820) --- container-images/container_image_prepare_defaults.yaml | 2 +- container-images/overcloud_containers.yaml | 2 +- container-images/tripleo_containers.yaml | 2 +- tripleo_common/tests/image/test_kolla_builder.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml index 8dc0a7194..21bbcfcee 100644 --- a/container-images/container_image_prepare_defaults.yaml +++ b/container-images/container_image_prepare_defaults.yaml @@ -42,6 +42,6 @@ parameter_defaults: ceph_node_exporter_image: node-exporter ceph_node_exporter_tag: v0.17.0 - ceph_grafana_namespace: quay.io/app-sre + ceph_grafana_namespace: quay.io/tripleo ceph_grafana_image: grafana ceph_grafana_tag: 5.2.4 diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index a791c3096..5d52440e1 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -203,7 +203,7 @@ container_images: image_source: prom - imagename: quay.io/prometheus/node-exporter:v0.17.0 image_source: prom -- imagename: quay.io/app-sre/grafana:5.2.4 +- imagename: quay.io/tripleo/grafana:5.2.4 image_source: grafana - imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo image_source: kolla diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml index ff7b0150c..f2116ab3b 100644 --- a/container-images/tripleo_containers.yaml +++ b/container-images/tripleo_containers.yaml @@ -207,5 +207,5 @@ container_images: image_source: prom - imagename: quay.io/prometheus/node-exporter:v0.17.0 image_source: prom -- imagename: quay.io/app-sre/grafana:5.2.4 +- imagename: quay.io/tripleo/grafana:5.2.4 image_source: grafana diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index f054484c9..ef94f244e 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -254,7 +254,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'ceph_namespace': 'quay.ceph.io/ceph-ci', 'ceph_image': 'daemon', 'ceph_tag': 'v4.0.13-stable-4.0-nautilus-centos-7-x86_64', - 'ceph_grafana_namespace': 'quay.io/app-sre', + 'ceph_grafana_namespace': 'quay.io/tripleo', 'ceph_grafana_image': 'grafana', 'ceph_grafana_tag': '5.2.4', 'ceph_prometheus_namespace': 'quay.io/prometheus', @@ -281,7 +281,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'ceph_namespace': 'quay.ceph.io/ceph-ci', 'ceph_image': 'ceph-daemon', 'ceph_tag': 'latest', - 'ceph_grafana_namespace': 'quay.io/app-sre', + 'ceph_grafana_namespace': 'quay.io/tripleo', 'ceph_grafana_image': 'grafana', 'ceph_grafana_tag': '5.2.4', 'ceph_prometheus_namespace': 'quay.io/prometheus', @@ -338,7 +338,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'ceph_namespace': 'quay.ceph.io/ceph-ci', 'ceph_image': 'ceph-daemon', 'ceph_tag': 'latest', - 'ceph_grafana_namespace': 'quay.io/app-sre', + 'ceph_grafana_namespace': 'quay.io/tripleo', 'ceph_grafana_image': 'grafana', 'ceph_grafana_tag': '5.2.4', 'ceph_prometheus_namespace': 'quay.io/prometheus',