From 1d027b7eaaa9d504172191588398714c0fc2e2f1 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 19 Dec 2019 13:23:11 +0100 Subject: [PATCH] Bump ceph/daemon container image to v4.0.10 Tested via https://review.opendev.org/562213 Change-Id: I67dd28bb5ebb86b64e6cd710b76aaa821f000658 --- container-images/container_image_prepare_defaults.yaml | 2 +- container-images/overcloud_containers.yaml | 2 +- tripleo_common/tests/image/test_kolla_builder.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml index 6d250c31e..2bdf26557 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.8-stable-4.0-nautilus-centos-7-x86_64 + ceph_tag: v4.0.10-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 52aa6398c..ab5831c48 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -183,7 +183,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.8-stable-4.0-nautilus-centos-7-x86_64 +- imagename: docker.io/ceph/daemon:v4.0.10-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 1ab7d7864..40a105c77 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -272,7 +272,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): expected = { 'namespace': '192.0.2.0:5000/tripleomaster', - 'ceph_namespace': 'docker.io/cephh', + 'ceph_namespace': 'docker.io/ceph', 'ceph_image': 'ceph-daemon', 'ceph_tag': 'latest', 'name_prefix': 'prefix-', @@ -302,7 +302,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): expected, builder.container_images_template_inputs( namespace='192.0.2.0:5000/tripleomaster', - ceph_namespace='docker.io/cephh', + ceph_namespace='docker.io/ceph', ceph_image='ceph-daemon', ceph_tag='latest', name_prefix='prefix',