From 44914c4ef193aa273ab3a32ffc65bcdaeaf61c63 Mon Sep 17 00:00:00 2001
From: "Gupta, Sangeet (sg774j)" <sg774j@att.com>
Date: Thu, 18 Nov 2021 21:30:10 +0000
Subject: [PATCH] cinder: Upgrade default images to ussuri

After volumev1 and volumev2 were removed, openstack-helm-infra gates
started failing because they are deploying defult cinder image which
is currently stein. The python-openstackclient for stein sets volumev2
as default volume type. This was failing volume commands in cinder
bootstrap job for openstack-helm-infra gates

Change-Id: Ifcb3c813f132c9deedaba9a11f9ef721efcb92b0
---
 cinder/Chart.yaml              |  2 +-
 cinder/values.yaml             | 24 ++++++++++++------------
 releasenotes/notes/cinder.yaml |  1 +
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index 750e77fb1e..b1346894bc 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 0.2.12
+version: 0.2.13
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 2fee400f13..6ac6502817 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -43,20 +43,20 @@ release_group: null
 images:
   tags:
     test: docker.io/xrally/xrally-openstack:2.0.0
-    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    cinder_db_sync: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    db_init: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    cinder_db_sync: docker.io/openstackhelm/cinder:ussuri-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
     rabbit_init: docker.io/rabbitmq:3.7-management
-    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    cinder_api: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    cinder_scheduler: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    cinder_volume: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    cinder_volume_usage_audit: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
+    ks_user: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    ks_service: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    ks_endpoints: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    cinder_api: docker.io/openstackhelm/cinder:ussuri-ubuntu_bionic
+    bootstrap: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    cinder_scheduler: docker.io/openstackhelm/cinder:ussuri-ubuntu_bionic
+    cinder_volume: docker.io/openstackhelm/cinder:ussuri-ubuntu_bionic
+    cinder_volume_usage_audit: docker.io/openstackhelm/cinder:ussuri-ubuntu_bionic
     cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic
-    cinder_backup: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
+    cinder_backup: docker.io/openstackhelm/cinder:ussuri-ubuntu_bionic
     cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index 692838f018..4421c99dff 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -29,4 +29,5 @@ cinder:
   - 0.2.10 Helm 3 - Fix Job Labels
   - 0.2.11 Update htk requirements repo
   - 0.2.12 Remove cinder v1/v2 defaults
+  - 0.2.13 Upgrade default images to ussuri
 ...