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:
parent
0e247bc4a3
commit
e19f2ca12d
|
@ -42,6 +42,6 @@ parameter_defaults:
|
||||||
ceph_node_exporter_image: node-exporter
|
ceph_node_exporter_image: node-exporter
|
||||||
ceph_node_exporter_tag: v0.17.0
|
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_image: grafana
|
||||||
ceph_grafana_tag: 5.2.4
|
ceph_grafana_tag: 5.2.4
|
||||||
|
|
|
@ -203,7 +203,7 @@ container_images:
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/prometheus/node-exporter:v0.17.0
|
- imagename: quay.io/prometheus/node-exporter:v0.17.0
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/app-sre/grafana:5.2.4
|
- imagename: quay.io/tripleo/grafana:5.2.4
|
||||||
image_source: grafana
|
image_source: grafana
|
||||||
- imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo
|
- imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo
|
||||||
image_source: kolla
|
image_source: kolla
|
||||||
|
|
|
@ -207,5 +207,5 @@ container_images:
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/prometheus/node-exporter:v0.17.0
|
- imagename: quay.io/prometheus/node-exporter:v0.17.0
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/app-sre/grafana:5.2.4
|
- imagename: quay.io/tripleo/grafana:5.2.4
|
||||||
image_source: grafana
|
image_source: grafana
|
||||||
|
|
|
@ -254,7 +254,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||||
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
||||||
'ceph_image': 'daemon',
|
'ceph_image': 'daemon',
|
||||||
'ceph_tag': 'v4.0.13-stable-4.0-nautilus-centos-7-x86_64',
|
'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_image': 'grafana',
|
||||||
'ceph_grafana_tag': '5.2.4',
|
'ceph_grafana_tag': '5.2.4',
|
||||||
'ceph_prometheus_namespace': 'quay.io/prometheus',
|
'ceph_prometheus_namespace': 'quay.io/prometheus',
|
||||||
|
@ -281,7 +281,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||||
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
||||||
'ceph_image': 'ceph-daemon',
|
'ceph_image': 'ceph-daemon',
|
||||||
'ceph_tag': 'latest',
|
'ceph_tag': 'latest',
|
||||||
'ceph_grafana_namespace': 'quay.io/app-sre',
|
'ceph_grafana_namespace': 'quay.io/tripleo',
|
||||||
'ceph_grafana_image': 'grafana',
|
'ceph_grafana_image': 'grafana',
|
||||||
'ceph_grafana_tag': '5.2.4',
|
'ceph_grafana_tag': '5.2.4',
|
||||||
'ceph_prometheus_namespace': 'quay.io/prometheus',
|
'ceph_prometheus_namespace': 'quay.io/prometheus',
|
||||||
|
@ -338,7 +338,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||||
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
||||||
'ceph_image': 'ceph-daemon',
|
'ceph_image': 'ceph-daemon',
|
||||||
'ceph_tag': 'latest',
|
'ceph_tag': 'latest',
|
||||||
'ceph_grafana_namespace': 'quay.io/app-sre',
|
'ceph_grafana_namespace': 'quay.io/tripleo',
|
||||||
'ceph_grafana_image': 'grafana',
|
'ceph_grafana_image': 'grafana',
|
||||||
'ceph_grafana_tag': '5.2.4',
|
'ceph_grafana_tag': '5.2.4',
|
||||||
'ceph_prometheus_namespace': 'quay.io/prometheus',
|
'ceph_prometheus_namespace': 'quay.io/prometheus',
|
||||||
|
|
Loading…
Reference in New Issue