From 7d39af25fddbf5fc67e15c92a9265f28567a214e Mon Sep 17 00:00:00 2001
From: okozachenko <okozachenko1203@gmail.com>
Date: Mon, 21 Aug 2023 19:58:37 +1000
Subject: [PATCH] nova: Add cinder auth config

Change-Id: Ieaf2400f73e5a9b940539a22ae696f19a6a1e2bf
---
 nova/Chart.yaml                   |  2 +-
 nova/templates/configmap-etc.yaml | 23 +++++++++++++++++++++++
 nova/values.yaml                  | 12 ++++++++++++
 releasenotes/notes/nova.yaml      |  1 +
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 9fcf731c48..259eefb789 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.19
+version: 0.3.20
 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 7df58a083a..aa4958bbff 100644
--- a/nova/templates/configmap-etc.yaml
+++ b/nova/templates/configmap-etc.yaml
@@ -252,6 +252,29 @@ 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 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 -}}
+{{- if empty .Values.conf.nova.cinder.project_name -}}
+{{- $_ := set .Values.conf.nova.cinder "project_name" .Values.endpoints.identity.auth.cinder.project_name -}}
+{{- end -}}
+{{- if empty .Values.conf.nova.cinder.project_domain_name -}}
+{{- $_ := set .Values.conf.nova.cinder "project_domain_name" .Values.endpoints.identity.auth.cinder.project_domain_name -}}
+{{- end -}}
+{{- if empty .Values.conf.nova.cinder.user_domain_name -}}
+{{- $_ := set .Values.conf.nova.cinder "user_domain_name" .Values.endpoints.identity.auth.cinder.user_domain_name -}}
+{{- end -}}
+{{- if empty .Values.conf.nova.cinder.username -}}
+{{- $_ := set .Values.conf.nova.cinder "username" .Values.endpoints.identity.auth.cinder.username -}}
+{{- end -}}
+{{- if empty .Values.conf.nova.cinder.password -}}
+{{- $_ := set .Values.conf.nova.cinder "password" .Values.endpoints.identity.auth.cinder.password -}}
+{{- 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 f63c537574..5e0ad1978b 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -1397,6 +1397,10 @@ conf:
       service_metadata_proxy: True
       auth_type: password
       auth_version: v3
+    cinder:
+      catalog_info: volumev3::internalURL
+      auth_url: null
+      auth_type: password
     database:
       max_retries: -1
     api_database:
@@ -1741,6 +1745,14 @@ endpoints:
         project_name: service
         user_domain_name: service
         project_domain_name: service
+      cinder:
+        role: admin,service
+        region_name: RegionOne
+        username: cinder
+        password: password
+        project_name: service
+        user_domain_name: service
+        project_domain_name: service
       test:
         role: admin
         region_name: RegionOne
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 4ecb1ca359..bd9fe240c3 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -88,4 +88,5 @@ nova:
   - 0.3.17 Set targeted dependency of nova-compute with ovn networking backend
   - 0.3.18 Fix nova ssh keys permission
   - 0.3.19 Add support for enabling vencrypt
+  - 0.3.20 Add cinder auth config
 ...