openstack/tripleo-common
Code Issues Proposed changes

Pin ceph dashboard containers on a specific tag

Browse Source 
Since in OSP context we want to rely on more stable ceph dashboard
content, in this review we pin the grafana/prometheus/alertmanager
and node-exporter containers to a specific tag suggested by ceph
team.

Change-Id: I2b308dea3c9e2380185fd3cce68a3aad5842a730
This commit is contained in:
fpantano 2019-11-06 11:53:29 +01:00
parent 26bd0efd26
commit f4d4a229ad
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container-images/container_image_prepare_defaults.yaml
View File

@ -32,16 +32,16 @@ parameter_defaults:
ceph_prometheus_namespace: docker.io/prom
ceph_prometheus_image: prometheus
ceph_prometheus_tag: latest
ceph_prometheus_tag: v2.7.2
ceph_alertmanager_namespace: docker.io/prom
ceph_alertmanager_image: alertmanager
ceph_alertmanager_tag: latest
ceph_alertmanager_tag: v0.16.2
ceph_node_exporter_namespace: docker.io/prom
ceph_node_exporter_image: node-exporter
ceph_node_exporter_tag: latest
ceph_node_exporter_tag: v0.17.0
ceph_grafana_namespace: docker.io/grafana
ceph_grafana_image: grafana
ceph_grafana_tag: latest
ceph_grafana_tag: 5.2.4

8
container-images/overcloud_containers.yaml
View File

@ -201,13 +201,13 @@ container_images:
image_source: kolla
- imagename: docker.io/ceph/daemon:v4.0.4-stable-4.0-nautilus-centos-7-x86_64
image_source: ceph
- imagename: docker.io/prom/prometheus:latest
- imagename: docker.io/prom/prometheus:v2.7.2
image_source: prom
- imagename: docker.io/prom/alertmanager:latest
- imagename: docker.io/prom/alertmanager:v0.16.2
image_source: prom
- imagename: docker.io/prom/node-exporter:latest
- imagename: docker.io/prom/node-exporter:v0.17.0
image_source: prom
- imagename: docker.io/grafana/grafana:latest
- imagename: docker.io/grafana/grafana:5.2.4
image_source: grafana
- imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
image_source: kolla

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

@ -239,16 +239,16 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'ceph_tag': 'v4.0.4-stable-4.0-nautilus-centos-7-x86_64',
'ceph_grafana_namespace': 'docker.io/grafana',
'ceph_grafana_image': 'grafana',
'ceph_grafana_tag': 'latest',
'ceph_grafana_tag': '5.2.4',
'ceph_prometheus_namespace': 'docker.io/prom',
'ceph_prometheus_image': 'prometheus',
'ceph_prometheus_tag': 'latest',
'ceph_prometheus_tag': 'v2.7.2',
'ceph_alertmanager_namespace': 'docker.io/prom',
'ceph_alertmanager_image': 'alertmanager',
'ceph_alertmanager_tag': 'latest',
'ceph_alertmanager_tag': 'v0.16.2',
'ceph_node_exporter_namespace': 'docker.io/prom',
'ceph_node_exporter_image': 'node-exporter',
'ceph_node_exporter_tag': 'latest',
'ceph_node_exporter_tag': 'v0.17.0',
'name_prefix': 'centos-binary-',
'name_suffix': '',
'tag': 'current-tripleo',
@ -266,16 +266,16 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'ceph_tag': 'latest',
'ceph_grafana_namespace': 'docker.io/grafana',
'ceph_grafana_image': 'grafana',
'ceph_grafana_tag': 'latest',
'ceph_grafana_tag': '5.2.4',
'ceph_prometheus_namespace': 'docker.io/prom',
'ceph_prometheus_image': 'prometheus',
'ceph_prometheus_tag': 'latest',
'ceph_prometheus_tag': 'v2.7.2',
'ceph_alertmanager_namespace': 'docker.io/prom',
'ceph_alertmanager_image': 'alertmanager',
'ceph_alertmanager_tag': 'latest',
'ceph_alertmanager_tag': 'v0.16.2',
'ceph_node_exporter_namespace': 'docker.io/prom',
'ceph_node_exporter_image': 'node-exporter',
'ceph_node_exporter_tag': 'latest',
'ceph_node_exporter_tag': 'v0.17.0',
'name_prefix': 'prefix-',
'name_suffix': '-suffix',
'tag': 'master',