From ef1e72c1d06629b134d05480a23835bc8d1d0e27 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <doug.goldstein@rackspace.com>
Date: Tue, 2 Jul 2024 16:27:18 -0500
Subject: [PATCH] neutron: fix authentication to ironic

There are no sane defaults set for authenticating to ironic for the
baremetal plugin, so this sets the same values used for other plugins.

Change-Id: Id8ee578d17bc40497ed5d39b56248b646f6cbeac
---
 neutron/Chart.yaml                   | 2 +-
 neutron/templates/configmap-etc.yaml | 3 +++
 neutron/values.yaml                  | 2 ++
 releasenotes/notes/neutron.yaml      | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index a65d2944d3..0c00c43a5b 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.3.44
+version: 0.3.45
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml
index 0fd7aa3ac3..db92641d9f 100644
--- a/neutron/templates/configmap-etc.yaml
+++ b/neutron/templates/configmap-etc.yaml
@@ -256,6 +256,9 @@ limitations under the License.
 {{- if empty .Values.conf.neutron.ironic.password -}}
 {{- $_ := set .Values.conf.neutron.ironic "password" .Values.endpoints.identity.auth.ironic.password -}}
 {{- end -}}
+{{- if empty $envAll.Values.conf.neutron.ironic.auth_url -}}
+{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.ironic "auth_url" -}}
+{{- end }}
 {{- end -}}
 
 {{- if ( has "tungstenfabric" .Values.network.backend ) -}}
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 8333a90b09..c3425c0710 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1970,6 +1970,8 @@ conf:
       endpoint_type: internal
       allow_reverse_dns_lookup: true
     ironic:
+      auth_type: password
+      auth_version: v3
       endpoint_type: internal
     keystone_authtoken:
       service_token_roles: service
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 0d1430fa90..b5fb105415 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -86,4 +86,5 @@ neutron:
   - 0.3.42 Update images used by default
   - 0.3.43 Switch neutron to uWSGI
   - 0.3.44 Add OVN VPNaas support
+  - 0.3.45 Fix ironic/baremetal authentication
 ...