From 7a5eadfda114fe034ddb91aa50aa9d147b87d421 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Tue, 26 Apr 2022 14:38:49 -0500
Subject: [PATCH] Update ironic defaults to use Wallaby

This change updates the default image values for the ironic chart
to use the wallaby release images.

This is part of the effort to remove older release references.

Change-Id: I485bc247c5d14176b6b4db36e2b5006a900238f9
---
 ironic/Chart.yaml              |  2 +-
 ironic/values.yaml             | 32 ++++++++++++++++----------------
 releasenotes/notes/ironic.yaml |  1 +
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml
index 686df1759b..e64c294993 100644
--- a/ironic/Chart.yaml
+++ b/ironic/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ironic
 name: ironic
-version: 0.2.3
+version: 0.2.4
 home: https://docs.openstack.org/ironic/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
 sources:
diff --git a/ironic/values.yaml b/ironic/values.yaml
index 0112a80ac6..ec3d0230c9 100644
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@@ -31,22 +31,22 @@ labels:
 
 images:
   tags:
-    ironic_manage_cleaning_network: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    ironic_retrive_cleaning_network: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    ironic_retrive_swift_config: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    ironic_manage_cleaning_network: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    ironic_retrive_cleaning_network: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    ironic_retrive_swift_config: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
     # Bootstrap image requires curl
-    bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    ironic_db_sync: docker.io/openstackhelm/ironic:ocata-ubuntu_xenial
-    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
+    bootstrap: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    db_drop: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    db_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    ironic_db_sync: docker.io/openstackhelm/ironic:wallaby-ubuntu_focal
+    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
     rabbit_init: docker.io/rabbitmq:3.7-management
-    ironic_api: docker.io/openstackhelm/ironic:ocata-ubuntu_xenial
-    ironic_conductor: docker.io/openstackhelm/ironic:ocata-ubuntu_xenial
-    ironic_pxe: docker.io/openstackhelm/ironic:ocata-ubuntu_xenial
-    ironic_pxe_init: docker.io/openstackhelm/ironic:ocata-ubuntu_xenial
+    ironic_api: docker.io/openstackhelm/ironic:wallaby-ubuntu_focal
+    ironic_conductor: docker.io/openstackhelm/ironic:wallaby-ubuntu_focal
+    ironic_pxe: docker.io/openstackhelm/ironic:wallaby-ubuntu_focal
+    ironic_pxe_init: docker.io/openstackhelm/ironic:wallaby-ubuntu_focal
     ironic_pxe_http: docker.io/nginx:1.13.3
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
@@ -232,11 +232,11 @@ bootstrap:
     source_base: http://tarballs.openstack.org/ironic-python-agent/tinyipa/files
     structured:
       ironic-agent.initramfs:
-        source: tinyipa-stable-ocata.gz
+        source: tinyipa-stable-wallaby.gz
         disk_format: ari
         container_format: ari
       ironic-agent.kernel:
-        source: tinyipa-stable-ocata.vmlinuz
+        source: tinyipa-stable-wallaby.vmlinuz
         disk_format: aki
         container_format: aki
   network:
diff --git a/releasenotes/notes/ironic.yaml b/releasenotes/notes/ironic.yaml
index 6a8d1a709a..bbb32cefce 100644
--- a/releasenotes/notes/ironic.yaml
+++ b/releasenotes/notes/ironic.yaml
@@ -7,4 +7,5 @@ ironic:
   - 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 defaults to W release
 ...