From d7696992324a3acc3ebe08067a4ef66c53f57acc Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Wed, 27 Apr 2022 10:08:18 -0500
Subject: [PATCH] Update image defaults to wallaby for ceilometer

This change is to update the default image values for the
ceilometer chart from ocata to wallaby.

Change-Id: I6df65334757e13a79b8872a12c2d87b97068c162
---
 ceilometer/Chart.yaml              |  2 +-
 ceilometer/values.yaml             | 22 +++++++++++-----------
 releasenotes/notes/ceilometer.yaml |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ceilometer/Chart.yaml b/ceilometer/Chart.yaml
index c304caa3..f786dbcd 100644
--- a/ceilometer/Chart.yaml
+++ b/ceilometer/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceilometer
 name: ceilometer
-version: 0.2.3
+version: 0.2.4
 home: https://docs.openstack.org/ceilometer/latest/
 sources:
   - https://opendev.org/openstack/ceilometer
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index 3abd3c0b..b314138d 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -48,18 +48,18 @@ images:
   tags:
     test: docker.io/xrally/xrally-openstack:2.0.0
     db_init_mongodb: docker.io/mongo:3.4.9-jessie
-    db_init: docker.io/kolla/ubuntu-source-ceilometer-api:ocata
-    ceilometer_db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:ocata
+    db_init: docker.io/kolla/ubuntu-source-ceilometer-api:wallaby
+    ceilometer_db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:wallaby
     rabbit_init: docker.io/rabbitmq:3.7-management
-    ks_user: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    ks_service: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    ks_endpoints: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    ceilometer_api: docker.io/kolla/ubuntu-source-ceilometer-api:ocata
-    ceilometer_central: docker.io/kolla/ubuntu-source-ceilometer-central:ocata
-    ceilometer_collector: docker.io/kolla/ubuntu-source-ceilometer-collector:ocata
-    ceilometer_compute: docker.io/kolla/ubuntu-source-ceilometer-compute:ocata
-    ceilometer_ipmi: docker.io/kolla/ubuntu-source-ceilometer-base:ocata
-    ceilometer_notification: docker.io/kolla/ubuntu-source-ceilometer-notification:ocata
+    ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    ks_service: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    ks_endpoints: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    ceilometer_api: docker.io/kolla/ubuntu-source-ceilometer-api:wallaby
+    ceilometer_central: docker.io/kolla/ubuntu-source-ceilometer-central:wallaby
+    ceilometer_collector: docker.io/kolla/ubuntu-source-ceilometer-collector:wallaby
+    ceilometer_compute: docker.io/kolla/ubuntu-source-ceilometer-compute:wallaby
+    ceilometer_ipmi: docker.io/kolla/ubuntu-source-ceilometer-base:wallaby
+    ceilometer_notification: docker.io/kolla/ubuntu-source-ceilometer-notification:wallaby
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
diff --git a/releasenotes/notes/ceilometer.yaml b/releasenotes/notes/ceilometer.yaml
index 7d4a16f1..aa211528 100644
--- a/releasenotes/notes/ceilometer.yaml
+++ b/releasenotes/notes/ceilometer.yaml
@@ -6,4 +6,5 @@ ceilometer:
   - 0.2.1 Use policies in yaml format
   - 0.2.2 Update htk requirements repo
   - 0.2.3 Enable taint toleration for Openstack services
+  - 0.2.4 Update default image values to Wallaby
 ...