From 3a1ac6b4379fc812d019a9b1cd802164481bdcbf Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 11 Oct 2019 15:07:47 +0200 Subject: [PATCH] Bump ceph/daemon container image to v4.0.4 Tested via https://review.opendev.org/562213 Change-Id: Ic98f4e8fb1659235ab1dcb6e7071fa13613a11fe --- 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 439d0a5c1..2e171b724 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.1-stable-4.0-nautilus-centos-7-x86_64 + ceph_tag: v4.0.4-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 f4ca1c879..7e55388b6 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/tripleomaster/centos-binary-zaqar-wsgi:current-tripleo image_source: kolla -- imagename: docker.io/ceph/daemon:v4.0.1-stable-4.0-nautilus-centos-7-x86_64 +- 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 image_source: prom diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index 64910379e..c6f4c502f 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/tripleomaster', 'ceph_namespace': 'docker.io/ceph', 'ceph_image': 'daemon', - 'ceph_tag': 'v4.0.1-stable-4.0-nautilus-centos-7-x86_64', + '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',