openstack/tripleo-common
Code Issues Proposed changes

Consume ceph, prom, grafana containers from quay.io

Browse Source 
In order to reduce dependency from docker.io. it switched to
the registry url of following containers to quay.io:
ceph - quay.ceph.io/ceph-ci
alertmanager, prometheus and node-exporter - quay.io/prometheus
grafana - quay.io/app-sre

It also updates the ceph daemon image tag from
v4.0.12-stable-4.0-nautilus-centos-7-x86_64
to v4.0.13-stable-4.0-nautilus-centos-7-x86_64.

Change-Id: I8be781e49765cd800f8a10b028ab1574292fdc67
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
This commit is contained in:
Chandan Kumar (raukadah) 2020-09-11 15:35:00 +05:30
parent 7885485d61
commit e25e52ff20
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
container-images/container_image_prepare_defaults.yaml
View File

@ -27,22 +27,22 @@ parameter_defaults:
# Container image name components for Ceph images.
# Only used if Ceph is deployed.
ceph_namespace: docker.io/ceph
ceph_namespace: quay.ceph.io/ceph-ci
ceph_image: daemon
ceph_tag: v4.0.12-stable-4.0-nautilus-centos-7-x86_64
ceph_tag: v4.0.13-stable-4.0-nautilus-centos-7-x86_64
ceph_prometheus_namespace: docker.io/prom
ceph_prometheus_namespace: quay.io/prometheus
ceph_prometheus_image: prometheus
ceph_prometheus_tag: v2.7.2
ceph_alertmanager_namespace: docker.io/prom
ceph_alertmanager_namespace: quay.io/prometheus
ceph_alertmanager_image: alertmanager
ceph_alertmanager_tag: v0.16.2
ceph_node_exporter_namespace: docker.io/prom
ceph_node_exporter_namespace: quay.io/prometheus
ceph_node_exporter_image: node-exporter
ceph_node_exporter_tag: v0.17.0
ceph_grafana_namespace: docker.io/grafana
ceph_grafana_namespace: quay.io/app-sre
ceph_grafana_image: grafana
ceph_grafana_tag: 5.4.3

10
container-images/tripleo_containers.yaml
View File

@ -173,15 +173,15 @@ container_images:
image_source: tripleo
- imagename: docker.io/tripleomaster/openstack-zaqar-wsgi:current-tripleo
image_source: tripleo
- imagename: docker.io/ceph/daemon:v4.0.12-stable-4.0-nautilus-centos-7-x86_64
- imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64
image_source: ceph
- imagename: docker.io/prom/prometheus:v2.7.2
- imagename: quay.io/prometheus/prometheus:v2.7.2
image_source: prom
- imagename: docker.io/prom/alertmanager:v0.16.2
- imagename: quay.io/prometheus/alertmanager:v0.16.2
image_source: prom
- imagename: docker.io/prom/node-exporter:v0.17.0
- imagename: quay.io/prometheus/node-exporter:v0.17.0
image_source: prom
- imagename: docker.io/grafana/grafana:5.4.3
- imagename: quay.io/app-sre/grafana:5.4.3
image_source: grafana
- imagename: docker.io/tripleomaster/openstack-tempest:current-tripleo
image_source: tripleo

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

@ -273,7 +273,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
expected = {
'namespace': '192.0.2.0:5000/tripleomaster',
'ceph_namespace': 'docker.io/ceph',
'ceph_namespace': 'quay.ceph.io/ceph-ci',
'ceph_image': 'ceph-daemon',
'ceph_tag': 'latest',
'name_prefix': 'prefix-',
@ -304,7 +304,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
expected,
builder.container_images_template_inputs(
namespace='192.0.2.0:5000/tripleomaster',
ceph_namespace='docker.io/ceph',
ceph_namespace='quay.ceph.io/ceph-ci',
ceph_image='ceph-daemon',
ceph_tag='latest',
name_prefix='prefix',