From 507ed30b956d95fa91b974a7cae4b1c5585a536d Mon Sep 17 00:00:00 2001
From: "Ritchie, Frank (fr801x)" <fr801x@att.com>
Date: Thu, 28 Sep 2023 11:48:55 -0400
Subject: [PATCH] Improve cinder authentication support

The current values specified in values.yaml along with the configmap-etc
template can make it very difficult for the end user to properly configure
a cinder authentication method other than password. These changes give the end
user the needed flexibility.

Change-Id: I99e75e1aa9ddd8378518b1291123a34d2881715f
---
 nova/Chart.yaml                   | 2 +-
 nova/templates/configmap-etc.yaml | 7 ++++++-
 nova/values.yaml                  | 2 --
 releasenotes/notes/nova.yaml      | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index c0229ab496..079772348a 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.3.25
+version: 0.3.26
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml
index aa4958bbff..f8b628ea1b 100644
--- a/nova/templates/configmap-etc.yaml
+++ b/nova/templates/configmap-etc.yaml
@@ -252,10 +252,12 @@ limitations under the License.
 {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.ironic "memcache_servers" -}}
 {{- end -}}
 
+{{- if .Values.conf.nova.cinder.auth_type -}}
+{{- if eq .Values.conf.nova.cinder.auth_type "password" -}}
+
 {{- if empty .Values.conf.nova.cinder.auth_url -}}
 {{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.cinder "auth_url" -}}
 {{- end -}}
-
 {{- if empty .Values.conf.nova.cinder.os_region_name -}}
 {{- $_ := set .Values.conf.nova.cinder "os_region_name" .Values.endpoints.identity.auth.cinder.region_name -}}
 {{- end -}}
@@ -275,6 +277,9 @@ limitations under the License.
 {{- $_ := set .Values.conf.nova.cinder "password" .Values.endpoints.identity.auth.cinder.password -}}
 {{- end -}}
 
+{{- end -}}
+{{- end -}}
+
 {{- if empty .Values.conf.nova.DEFAULT.osapi_compute_listen_port -}}
 {{- $_ := tuple "compute" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.DEFAULT "osapi_compute_listen_port" -}}
 {{- end -}}
diff --git a/nova/values.yaml b/nova/values.yaml
index 7a05ff12ac..4718358cb3 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -1403,8 +1403,6 @@ conf:
       auth_version: v3
     cinder:
       catalog_info: volumev3::internalURL
-      auth_url: null
-      auth_type: password
     database:
       max_retries: -1
     api_database:
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 4b9c46b2f5..ca24f320e0 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -94,4 +94,5 @@ nova:
   - 0.3.23 Add Ubuntu Jammy overrides
   - 0.3.24 Create a certificate for novnc vencrypt separately
   - 0.3.25 Add IP addresses search control flag
+  - 0.3.26 Improve cinder authentication support
 ...