openstack
/
tripleo-common
Code Issues Proposed changes

Move the ceph monitoring stack containers to quay.io 

quay.ceph.io is no longer accessible and the Ceph Org moved to
quay.io. This patch just updates the container image references
to point to the new registry.

Closes-Bug: #1973115
Change-Id: I5673ff0480341cce4e0680587648c10c82ab1285
(cherry picked from commit a75b38b20d)
This commit is contained in:
Francesco Pantano 2022-05-12 09:06:41 +02:00
parent 7fcd60cd9c
commit a23c41ddf4
No known key found for this signature in database
GPG Key ID: 0458D4D1F41BD75C
4 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
container-images/container_image_prepare_defaults.yaml
View File

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

10
container-images/overcloud_containers.yaml
View File

@ -195,15 +195,15 @@ container_images:
image_source: kolla
- imagename: quay.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo
image_source: kolla
- imagename: quay.ceph.io/ceph-ci/daemon:v4.0.19-stable-4.0-nautilus-centos-7-x86_64
- imagename: quay.io/ceph/daemon:v4.0.19-stable-4.0-nautilus-centos-7-x86_64
image_source: ceph
- imagename: quay.ceph.io/prometheus/prometheus:v2.7.2
- imagename: quay.io/prometheus/prometheus:v2.7.2
image_source: prom
- imagename: quay.ceph.io/prometheus/alertmanager:v0.16.2
- imagename: quay.io/prometheus/alertmanager:v0.16.2
image_source: prom
- imagename: quay.ceph.io/prometheus/node-exporter:v0.17.0
- imagename: quay.io/prometheus/node-exporter:v0.17.0
image_source: prom
- imagename: quay.ceph.io/app-sre/grafana:5.4.3
- imagename: quay.io/ceph/ceph-grafana:6.7.4
image_source: grafana
- imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo
image_source: kolla

10
container-images/tripleo_containers.yaml
View File

@ -199,15 +199,15 @@ container_images:
imagename: quay.io/tripleotrain/centos-binary-tripleoclient:current-tripleo
- image_source: tripleo
imagename: quay.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo
- imagename: quay.ceph.io/ceph-ci/daemon:v4.0.19-stable-4.0-nautilus-centos-7-x86_64
- imagename: quay.io/ceph/daemon:v4.0.19-stable-4.0-nautilus-centos-7-x86_64
image_source: ceph
- imagename: quay.ceph.io/prometheus/prometheus:v2.7.2
- imagename: quay.io/prometheus/prometheus:v2.7.2
image_source: prom
- imagename: quay.ceph.io/prometheus/alertmanager:v0.16.2
- imagename: quay.io/prometheus/alertmanager:v0.16.2
image_source: prom
- imagename: quay.ceph.io/prometheus/node-exporter:v0.17.0
- imagename: quay.io/prometheus/node-exporter:v0.17.0
image_source: prom
- imagename: quay.ceph.io/app-sre/grafana:5.4.3
- imagename: quay.io/ceph/ceph-grafana:6.7.4
image_source: grafana
- imagename: quay.io/tripleotrain/centos-binary-unbound:current-tripleo
image_source: tripleo

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

@ -251,19 +251,19 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual(
{
'namespace': 'docker.io/tripleotrain',
'ceph_namespace': 'quay.ceph.io/ceph-ci',
'ceph_namespace': 'quay.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'v4.0.19-stable-4.0-nautilus-centos-7-x86_64',
'ceph_grafana_namespace': 'quay.ceph.io/app-sre',
'ceph_grafana_image': 'grafana',
'ceph_grafana_tag': '5.4.3',
'ceph_prometheus_namespace': 'quay.ceph.io/prometheus',
'ceph_grafana_namespace': 'quay.io/ceph',
'ceph_grafana_image': 'ceph-grafana',
'ceph_grafana_tag': '6.7.4',
'ceph_prometheus_namespace': 'quay.io/prometheus',
'ceph_prometheus_image': 'prometheus',
'ceph_prometheus_tag': 'v2.7.2',
'ceph_alertmanager_namespace': 'quay.ceph.io/prometheus',
'ceph_alertmanager_namespace': 'quay.io/prometheus',
'ceph_alertmanager_image': 'alertmanager',
'ceph_alertmanager_tag': 'v0.16.2',
'ceph_node_exporter_namespace': 'quay.ceph.io/prometheus',
'ceph_node_exporter_namespace': 'quay.io/prometheus',
'ceph_node_exporter_image': 'node-exporter',
'ceph_node_exporter_tag': 'v0.17.0',
'name_prefix': 'centos-binary-',
@ -278,19 +278,19 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual(
{
'namespace': '192.0.2.0:5000/tripleotrain',
'ceph_namespace': 'quay.ceph.io/ceph-ci',
'ceph_image': 'ceph-daemon',
'ceph_namespace': 'quay.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'latest',
'ceph_grafana_namespace': 'quay.ceph.io/app-sre',
'ceph_grafana_image': 'grafana',
'ceph_grafana_tag': '5.4.3',
'ceph_prometheus_namespace': 'quay.ceph.io/prometheus',
'ceph_grafana_namespace': 'quay.io/ceph',
'ceph_grafana_image': 'ceph-grafana',
'ceph_grafana_tag': '6.7.4',
'ceph_prometheus_namespace': 'quay.io/prometheus',
'ceph_prometheus_image': 'prometheus',
'ceph_prometheus_tag': 'v2.7.2',
'ceph_alertmanager_namespace': 'quay.ceph.io/prometheus',
'ceph_alertmanager_namespace': 'quay.io/prometheus',
'ceph_alertmanager_image': 'alertmanager',
'ceph_alertmanager_tag': 'v0.16.2',
'ceph_node_exporter_namespace': 'quay.ceph.io/prometheus',
'ceph_node_exporter_namespace': 'quay.io/prometheus',
'ceph_node_exporter_image': 'node-exporter',
'ceph_node_exporter_tag': 'v0.17.0',
'name_prefix': 'prefix-',
@ -301,8 +301,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
},
builder.container_images_template_inputs(
namespace='192.0.2.0:5000/tripleotrain',
ceph_namespace='quay.ceph.io/ceph-ci',
ceph_image='ceph-daemon',
ceph_namespace='quay.io/ceph',
ceph_image='daemon',
ceph_tag='latest',
name_prefix='prefix',
name_suffix='suffix',
@ -322,8 +322,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
defs['namespace'] = 'docker.io/tripleotrain'
kb.CONTAINER_IMAGES_DEFAULTS = defs
result = builder.container_images_template_inputs(
ceph_namespace='quay.ceph.io/ceph-ci',
ceph_image='ceph-daemon',
ceph_namespace='quay.io/ceph',
ceph_image='daemon',
ceph_tag='latest',
name_prefix='prefix',
name_suffix='suffix',
@ -335,19 +335,19 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual(
{
'namespace': 'docker.io/tripleotraincentos8',
'ceph_namespace': 'quay.ceph.io/ceph-ci',
'ceph_image': 'ceph-daemon',
'ceph_namespace': 'quay.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'latest',
'ceph_grafana_namespace': 'quay.ceph.io/app-sre',
'ceph_grafana_image': 'grafana',
'ceph_grafana_tag': '5.4.3',
'ceph_prometheus_namespace': 'quay.ceph.io/prometheus',
'ceph_grafana_namespace': 'quay.io/ceph',
'ceph_grafana_image': 'ceph-grafana',
'ceph_grafana_tag': '6.7.4',
'ceph_prometheus_namespace': 'quay.io/prometheus',
'ceph_prometheus_image': 'prometheus',
'ceph_prometheus_tag': 'v2.7.2',
'ceph_alertmanager_namespace': 'quay.ceph.io/prometheus',
'ceph_alertmanager_namespace': 'quay.io/prometheus',
'ceph_alertmanager_image': 'alertmanager',
'ceph_alertmanager_tag': 'v0.16.2',
'ceph_node_exporter_namespace': 'quay.ceph.io/prometheus',
'ceph_node_exporter_namespace': 'quay.io/prometheus',
'ceph_node_exporter_image': 'node-exporter',
'ceph_node_exporter_tag': 'v0.17.0',
'name_prefix': 'prefix-',