From 97bb49e97c97ba9922b2e0e69150c9e8be806021 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Tue, 19 Jan 2021 12:08:45 +0100 Subject: [PATCH] Bump Ceph containers to octopus Wallaby+ is going to use the Ceph Octopus/Pacific releases. The purpose of this review is to make the ceph 5 containers available to the cephadm provisioning process. Change-Id: Ic42055f642312f9e7a6fead1ac72d3a9e2b7a241 --- container-images/container_image_prepare_defaults.yaml | 4 ++-- container-images/tripleo_containers.yaml | 4 ++-- 2 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 55ba0ae84..f66fd7978 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: quay.ceph.io/ceph-ci ceph_image: daemon - ceph_tag: v4.0.13-stable-4.0-nautilus-centos-7-x86_64 + ceph_tag: v5.0.7-stable-5.0-octopus-centos-8-x86_64 ceph_prometheus_namespace: quay.io/prometheus ceph_prometheus_image: prometheus @@ -44,4 +44,4 @@ parameter_defaults: ceph_grafana_namespace: quay.io/app-sre ceph_grafana_image: grafana - ceph_grafana_tag: 5.4.3 + ceph_grafana_tag: 6.7.4 diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml index b29a71083..20c9e99c7 100644 --- a/container-images/tripleo_containers.yaml +++ b/container-images/tripleo_containers.yaml @@ -173,7 +173,7 @@ container_images: image_source: tripleo - imagename: quay.io/tripleomaster/openstack-zaqar-wsgi:current-tripleo image_source: tripleo -- imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64 +- imagename: quay.ceph.io/ceph-ci/daemon:v5.0.7-stable-5.0-octopus-centos-8-x86_64 image_source: ceph - imagename: quay.io/prometheus/prometheus:v2.7.2 image_source: prom @@ -181,7 +181,7 @@ container_images: image_source: prom - imagename: quay.io/prometheus/node-exporter:v0.17.0 image_source: prom -- imagename: quay.io/app-sre/grafana:5.4.3 +- imagename: quay.io/app-sre/grafana:6.7.4 image_source: grafana - imagename: quay.io/tripleomaster/openstack-tempest:current-tripleo image_source: tripleo