openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Bump ceph/daemon container image to v4.0.8" into stable/train

This commit is contained in:
Zuul 2019-12-26 19:49:44 +00:00 committed by Gerrit Code Review
parent 69ea207da2 8f54f3b215
commit 03bd929ec5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/container_image_prepare_defaults.yaml
View File

@ -28,7 +28,7 @@ parameter_defaults:
# Only used if Ceph is deployed.
ceph_namespace: docker.io/ceph
ceph_image: daemon
ceph_tag: v4.0.4-stable-4.0-nautilus-centos-7-x86_64
ceph_tag: v4.0.8-stable-4.0-nautilus-centos-7-x86_64
ceph_prometheus_namespace: docker.io/prom
ceph_prometheus_image: prometheus

2
container-images/overcloud_containers.yaml
View File

@ -199,7 +199,7 @@ container_images:
image_source: kolla
- imagename: docker.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo
image_source: kolla
- imagename: docker.io/ceph/daemon:v4.0.4-stable-4.0-nautilus-centos-7-x86_64
- imagename: docker.io/ceph/daemon:v4.0.8-stable-4.0-nautilus-centos-7-x86_64
image_source: ceph
- imagename: docker.io/prom/prometheus:v2.7.2
image_source: prom

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

@ -236,7 +236,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'namespace': 'docker.io/tripleotrain',
'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'v4.0.4-stable-4.0-nautilus-centos-7-x86_64',
'ceph_tag': 'v4.0.8-stable-4.0-nautilus-centos-7-x86_64',
'ceph_grafana_namespace': 'docker.io/grafana',
'ceph_grafana_image': 'grafana',
'ceph_grafana_tag': '5.2.4',