openstack
/
tripleo-common
Code Issues Proposed changes

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) <chkumar@redhat.com>
Change-Id: I6999e683edd82ef61fba768013b12408851f6f09
(cherry picked from commit e0b0d859ef)
This commit is contained in:
Chandan Kumar (raukadah) 2021-03-23 12:22:55 +05:30
parent 0e247bc4a3
commit e19f2ca12d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/container_image_prepare_defaults.yaml
View File

@ -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

2
container-images/overcloud_containers.yaml
View File

@ -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

2
container-images/tripleo_containers.yaml
View File

@ -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

6
tripleo_common/tests/image/test_kolla_builder.py
View File

@ -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',