From ac010d626cc9b1a4a826d9eaa0ecf46ea4d1be5a Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 21 Apr 2020 13:20:00 +0200 Subject: [PATCH] Bump ceph/daemon container image to v4.0.12 The new container image bumps up Ceph to 14.2.9 and is tested via change I7e50d1c0d9483cc1462ec13b430ff16f9f4adb2c Change-Id: I1d14cc6363f2cd07a70970dc5dd38218818be56d (cherry picked from commit c5a02ef9e025614f97c765ef88ad277e12092147) --- container-images/container_image_prepare_defaults.yaml | 2 +- container-images/overcloud_containers.yaml | 2 +- tripleo_common/tests/image/test_kolla_builder.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml index a31e3f3d8..6a399791f 100644 --- a/container-images/container_image_prepare_defaults.yaml +++ b/container-images/container_image_prepare_defaults.yaml @@ -28,7 +28,7 @@ parameter_defaults: # Only used if Ceph is deployed. ceph_namespace: docker.io/ceph ceph_image: daemon - ceph_tag: v4.0.10-stable-4.0-nautilus-centos-7-x86_64 + ceph_tag: v4.0.12-stable-4.0-nautilus-centos-7-x86_64 ceph_prometheus_namespace: docker.io/prom ceph_prometheus_image: prometheus diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 5e4f3693c..26dea0f02 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -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.10-stable-4.0-nautilus-centos-7-x86_64 +- imagename: docker.io/ceph/daemon:v4.0.12-stable-4.0-nautilus-centos-7-x86_64 image_source: ceph - imagename: docker.io/prom/prometheus:v2.7.2 image_source: prom diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index a4e05c59b..89878931b 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -236,7 +236,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'namespace': 'docker.io/tripleotrain', 'ceph_namespace': 'docker.io/ceph', 'ceph_image': 'daemon', - 'ceph_tag': 'v4.0.10-stable-4.0-nautilus-centos-7-x86_64', + 'ceph_tag': 'v4.0.12-stable-4.0-nautilus-centos-7-x86_64', 'ceph_grafana_namespace': 'docker.io/grafana', 'ceph_grafana_image': 'grafana', 'ceph_grafana_tag': '5.2.4',