openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Consume ceph, prom, grafana containers from quay.io" into stable/train

This commit is contained in:
Zuul 2020-09-20 10:32:36 +00:00 committed by Gerrit Code Review
parent 9cfd055103 87df35c581
commit 98436316ed
4 changed files with 34 additions and 34 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. # Container image name components for Ceph images.
# Only used if Ceph is deployed. # Only used if Ceph is deployed.
ceph_namespace: docker.io/ceph ceph_namespace: quay.ceph.io/ceph-ci
ceph_image: daemon 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_image: prometheus
ceph_prometheus_tag: v2.7.2 ceph_prometheus_tag: v2.7.2
ceph_alertmanager_namespace: docker.io/prom ceph_alertmanager_namespace: quay.io/prometheus
ceph_alertmanager_image: alertmanager ceph_alertmanager_image: alertmanager
ceph_alertmanager_tag: v0.16.2 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_image: node-exporter
ceph_node_exporter_tag: v0.17.0 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_image: grafana
ceph_grafana_tag: 5.2.4 ceph_grafana_tag: 5.2.4

10
container-images/overcloud_containers.yaml
View File

@ -195,15 +195,15 @@ container_images:
image_source: kolla image_source: kolla
- imagename: docker.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo - imagename: docker.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo
image_source: kolla image_source: kolla
- 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 image_source: ceph
- imagename: docker.io/prom/prometheus:v2.7.2 - imagename: quay.io/prometheus/prometheus:v2.7.2
image_source: prom image_source: prom
- imagename: docker.io/prom/alertmanager:v0.16.2 - imagename: quay.io/prometheus/alertmanager:v0.16.2
image_source: prom image_source: prom
- imagename: docker.io/prom/node-exporter:v0.17.0 - imagename: quay.io/prometheus/node-exporter:v0.17.0
image_source: prom image_source: prom
- imagename: docker.io/grafana/grafana:5.2.4 - imagename: quay.io/app-sre/grafana:5.2.4
image_source: grafana image_source: grafana
- imagename: docker.io/tripleotrain/centos-binary-tempest:current-tripleo - imagename: docker.io/tripleotrain/centos-binary-tempest:current-tripleo
image_source: kolla image_source: kolla

10
container-images/tripleo_containers.yaml
View File

@ -221,13 +221,13 @@ container_images:
imagename: docker.io/tripleotraincentos8/centos-binary-tripleoclient:current-tripleo imagename: docker.io/tripleotraincentos8/centos-binary-tripleoclient:current-tripleo
- image_source: tripleo - image_source: tripleo
imagename: docker.io/tripleotraincentos8/centos-binary-zaqar-wsgi:current-tripleo imagename: docker.io/tripleotraincentos8/centos-binary-zaqar-wsgi:current-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 image_source: ceph
- imagename: docker.io/prom/prometheus:v2.7.2 - imagename: quay.io/prometheus/prometheus:v2.7.2
image_source: prom image_source: prom
- imagename: docker.io/prom/alertmanager:v0.16.2 - imagename: quay.io/prometheus/alertmanager:v0.16.2
image_source: prom image_source: prom
- imagename: docker.io/prom/node-exporter:v0.17.0 - imagename: quay.io/prometheus/node-exporter:v0.17.0
image_source: prom image_source: prom
- imagename: docker.io/grafana/grafana:5.2.4 - imagename: quay.io/app-sre/grafana:5.2.4
image_source: grafana image_source: grafana

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

@ -251,19 +251,19 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual( self.assertEqual(
{ {
'namespace': 'docker.io/tripleotrain', 'namespace': 'docker.io/tripleotrain',
'ceph_namespace': 'docker.io/ceph', 'ceph_namespace': 'quay.ceph.io/ceph-ci',
'ceph_image': 'daemon', '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_grafana_namespace': 'docker.io/grafana', 'ceph_grafana_namespace': 'quay.io/app-sre',
'ceph_grafana_image': 'grafana', 'ceph_grafana_image': 'grafana',
'ceph_grafana_tag': '5.2.4', 'ceph_grafana_tag': '5.2.4',
'ceph_prometheus_namespace': 'docker.io/prom', 'ceph_prometheus_namespace': 'quay.io/prometheus',
'ceph_prometheus_image': 'prometheus', 'ceph_prometheus_image': 'prometheus',
'ceph_prometheus_tag': 'v2.7.2', 'ceph_prometheus_tag': 'v2.7.2',
'ceph_alertmanager_namespace': 'docker.io/prom', 'ceph_alertmanager_namespace': 'quay.io/prometheus',
'ceph_alertmanager_image': 'alertmanager', 'ceph_alertmanager_image': 'alertmanager',
'ceph_alertmanager_tag': 'v0.16.2', '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_image': 'node-exporter',
'ceph_node_exporter_tag': 'v0.17.0', 'ceph_node_exporter_tag': 'v0.17.0',
'name_prefix': 'centos-binary-', 'name_prefix': 'centos-binary-',
@ -279,19 +279,19 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual( self.assertEqual(
{ {
'namespace': '192.0.2.0:5000/tripleotrain', 'namespace': '192.0.2.0:5000/tripleotrain',
'ceph_namespace': 'docker.io/cephh', 'ceph_namespace': 'quay.ceph.io/ceph-ci',
'ceph_image': 'ceph-daemon', 'ceph_image': 'ceph-daemon',
'ceph_tag': 'latest', 'ceph_tag': 'latest',
'ceph_grafana_namespace': 'docker.io/grafana', 'ceph_grafana_namespace': 'quay.io/app-sre',
'ceph_grafana_image': 'grafana', 'ceph_grafana_image': 'grafana',
'ceph_grafana_tag': '5.2.4', 'ceph_grafana_tag': '5.2.4',
'ceph_prometheus_namespace': 'docker.io/prom', 'ceph_prometheus_namespace': 'quay.io/prometheus',
'ceph_prometheus_image': 'prometheus', 'ceph_prometheus_image': 'prometheus',
'ceph_prometheus_tag': 'v2.7.2', 'ceph_prometheus_tag': 'v2.7.2',
'ceph_alertmanager_namespace': 'docker.io/prom', 'ceph_alertmanager_namespace': 'quay.io/prometheus',
'ceph_alertmanager_image': 'alertmanager', 'ceph_alertmanager_image': 'alertmanager',
'ceph_alertmanager_tag': 'v0.16.2', '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_image': 'node-exporter',
'ceph_node_exporter_tag': 'v0.17.0', 'ceph_node_exporter_tag': 'v0.17.0',
'name_prefix': 'prefix-', 'name_prefix': 'prefix-',
@ -303,7 +303,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
}, },
builder.container_images_template_inputs( builder.container_images_template_inputs(
namespace='192.0.2.0:5000/tripleotrain', namespace='192.0.2.0:5000/tripleotrain',
ceph_namespace='docker.io/cephh', ceph_namespace='quay.ceph.io/ceph-ci',
ceph_image='ceph-daemon', ceph_image='ceph-daemon',
ceph_tag='latest', ceph_tag='latest',
name_prefix='prefix', name_prefix='prefix',
@ -324,7 +324,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
defs['namespace'] = 'docker.io/tripleotrain' defs['namespace'] = 'docker.io/tripleotrain'
kb.CONTAINER_IMAGES_DEFAULTS = defs kb.CONTAINER_IMAGES_DEFAULTS = defs
result = builder.container_images_template_inputs( result = builder.container_images_template_inputs(
ceph_namespace='docker.io/cephh', ceph_namespace='quay.ceph.io/ceph-ci',
ceph_image='ceph-daemon', ceph_image='ceph-daemon',
ceph_tag='latest', ceph_tag='latest',
name_prefix='prefix', name_prefix='prefix',
@ -337,19 +337,19 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual( self.assertEqual(
{ {
'namespace': 'docker.io/tripleotraincentos8', 'namespace': 'docker.io/tripleotraincentos8',
'ceph_namespace': 'docker.io/cephh', 'ceph_namespace': 'quay.ceph.io/ceph-ci',
'ceph_image': 'ceph-daemon', 'ceph_image': 'ceph-daemon',
'ceph_tag': 'latest', 'ceph_tag': 'latest',
'ceph_grafana_namespace': 'docker.io/grafana', 'ceph_grafana_namespace': 'quay.io/app-sre',
'ceph_grafana_image': 'grafana', 'ceph_grafana_image': 'grafana',
'ceph_grafana_tag': '5.2.4', 'ceph_grafana_tag': '5.2.4',
'ceph_prometheus_namespace': 'docker.io/prom', 'ceph_prometheus_namespace': 'quay.io/prometheus',
'ceph_prometheus_image': 'prometheus', 'ceph_prometheus_image': 'prometheus',
'ceph_prometheus_tag': 'v2.7.2', 'ceph_prometheus_tag': 'v2.7.2',
'ceph_alertmanager_namespace': 'docker.io/prom', 'ceph_alertmanager_namespace': 'quay.io/prometheus',
'ceph_alertmanager_image': 'alertmanager', 'ceph_alertmanager_image': 'alertmanager',
'ceph_alertmanager_tag': 'v0.16.2', '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_image': 'node-exporter',
'ceph_node_exporter_tag': 'v0.17.0', 'ceph_node_exporter_tag': 'v0.17.0',
'name_prefix': 'prefix-', 'name_prefix': 'prefix-',