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
This commit is contained in:
Doug Goldstein 2024-07-02 16:27:18 -05:00
parent d1fc708000
commit ef1e72c1d0
No known key found for this signature in database
GPG Key ID: 11F806DA366D8DEC
4 changed files with 7 additions and 1 deletions

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Neutron description: OpenStack-Helm Neutron
name: neutron name: neutron
version: 0.3.44 version: 0.3.45
home: https://docs.openstack.org/neutron/latest/ home: https://docs.openstack.org/neutron/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
sources: sources:

View File

@ -256,6 +256,9 @@ limitations under the License.
{{- if empty .Values.conf.neutron.ironic.password -}} {{- if empty .Values.conf.neutron.ironic.password -}}
{{- $_ := set .Values.conf.neutron.ironic "password" .Values.endpoints.identity.auth.ironic.password -}} {{- $_ := set .Values.conf.neutron.ironic "password" .Values.endpoints.identity.auth.ironic.password -}}
{{- end -}} {{- 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 -}} {{- end -}}
{{- if ( has "tungstenfabric" .Values.network.backend ) -}} {{- if ( has "tungstenfabric" .Values.network.backend ) -}}

View File

@ -1970,6 +1970,8 @@ conf:
endpoint_type: internal endpoint_type: internal
allow_reverse_dns_lookup: true allow_reverse_dns_lookup: true
ironic: ironic:
auth_type: password
auth_version: v3
endpoint_type: internal endpoint_type: internal
keystone_authtoken: keystone_authtoken:
service_token_roles: service service_token_roles: service

View File

@ -86,4 +86,5 @@ neutron:
- 0.3.42 Update images used by default - 0.3.42 Update images used by default
- 0.3.43 Switch neutron to uWSGI - 0.3.43 Switch neutron to uWSGI
- 0.3.44 Add OVN VPNaas support - 0.3.44 Add OVN VPNaas support
- 0.3.45 Fix ironic/baremetal authentication
... ...