From 97a6a8bb73e9e19e520a825aabd4de7271b28ff1 Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Fri, 19 Dec 2025 13:27:35 +0800
Subject: [PATCH] Add missing auth config for ironic

Change-Id: I034f13ca711ca2f1a9affd22901b8c35e561b0f0
Signed-off-by: ricolin <rlin@vexxhost.com>
Signed-off-by: Vladimir Kozhukalov <kozhukalov@gmail.com>
---
 ironic/templates/configmap-etc.yaml           | 43 +++++++++++++++++++
 ironic/values.yaml                            | 37 ++++++++++++++++
 .../notes/ironic-4a1d33f9e4147b79.yaml        |  5 +++
 3 files changed, 85 insertions(+)
 create mode 100644 releasenotes/notes/ironic-4a1d33f9e4147b79.yaml

diff --git a/ironic/templates/configmap-etc.yaml b/ironic/templates/configmap-etc.yaml
index 8b253360cc..c13ff39336 100644
--- a/ironic/templates/configmap-etc.yaml
+++ b/ironic/templates/configmap-etc.yaml
@@ -127,6 +127,49 @@ limitations under the License.
 {{- $_ := set .Values.conf.ironic.inspector "password" .Values.endpoints.identity.auth.ironic.password -}}
 {{- end -}}
 
+{{- if empty .Values.conf.ironic.nova.url -}}
+{{- $_ := tuple "compute" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.nova "url" -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.nova.auth_url -}}
+{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.nova "auth_url" -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.nova.project_name -}}
+{{- $_ := set .Values.conf.ironic.nova "project_name" .Values.endpoints.identity.auth.ironic.project_name -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.nova.project_domain_name -}}
+{{- $_ := set .Values.conf.ironic.nova "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.nova.user_domain_name -}}
+{{- $_ := set .Values.conf.ironic.nova "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.nova.username -}}
+{{- $_ := set .Values.conf.ironic.nova "username" .Values.endpoints.identity.auth.ironic.username -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.nova.password -}}
+{{- $_ := set .Values.conf.ironic.nova "password" .Values.endpoints.identity.auth.ironic.password -}}
+{{- end -}}
+
+{{- if empty .Values.conf.ironic.cinder.url -}}
+{{- $_ := tuple "volumev3" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.cinder "url" -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.cinder.auth_url -}}
+{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.cinder "auth_url" -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.cinder.project_name -}}
+{{- $_ := set .Values.conf.ironic.cinder "project_name" .Values.endpoints.identity.auth.ironic.project_name -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.cinder.project_domain_name -}}
+{{- $_ := set .Values.conf.ironic.cinder "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.cinder.user_domain_name -}}
+{{- $_ := set .Values.conf.ironic.cinder "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.cinder.username -}}
+{{- $_ := set .Values.conf.ironic.cinder "username" .Values.endpoints.identity.auth.ironic.username -}}
+{{- end -}}
+{{- if empty .Values.conf.ironic.cinder.password -}}
+{{- $_ := set .Values.conf.ironic.cinder "password" .Values.endpoints.identity.auth.ironic.password -}}
+{{- end -}}
 
 {{- if empty .Values.conf.ironic.neutron.url -}}
 {{- $_ := tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.neutron "url" -}}
diff --git a/ironic/values.yaml b/ironic/values.yaml
index ac0d0f632b..4cb8fd128e 100644
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@@ -113,6 +113,10 @@ conf:
       connection: null
     deploy:
       http_root: /var/lib/openstack-helm/httpboot
+    nova:
+      auth_type: password
+    cinder:
+      auth_type: password
     glance:
       auth_type: password
       swift_temp_url_duration: 86400
@@ -536,6 +540,39 @@ endpoints:
         public: 80
       pxe_http:
         default: 8080
+  volumev3:
+    name: cinderv3
+    hosts:
+      default: cinder-api
+      public: cinder
+    host_fqdn_override:
+      default: null
+    path:
+      default: '/v3/%(tenant_id)s'
+      healthcheck: /healthcheck
+    scheme:
+      default: http
+    port:
+      api:
+        default: 8776
+        public: 80
+  compute:
+    name: nova
+    hosts:
+      default: nova-api
+      public: nova
+    host_fqdn_override:
+      default: null
+    path:
+      default: "/v2.1/%(tenant_id)s"
+    scheme:
+      default: 'http'
+    port:
+      api:
+        default: 8774
+        public: 80
+      novncproxy:
+        default: 6080
   image:
     name: glance
     hosts:
diff --git a/releasenotes/notes/ironic-4a1d33f9e4147b79.yaml b/releasenotes/notes/ironic-4a1d33f9e4147b79.yaml
new file mode 100644
index 0000000000..542e6a69bb
--- /dev/null
+++ b/releasenotes/notes/ironic-4a1d33f9e4147b79.yaml
@@ -0,0 +1,5 @@
+---
+ironic:
+  - |
+    Add missing ironic authentication config for `[nova]` and `[cinder]`.
+...