Merge "Add missing auth config for ironic"

This commit is contained in:
Zuul
2025-12-28 22:14:45 +00:00
committed by Gerrit Code Review
3 changed files with 85 additions and 0 deletions

View File

@@ -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" -}}

View File

@@ -112,6 +112,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
@@ -531,6 +535,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:

View File

@@ -0,0 +1,5 @@
---
ironic:
- |
Add missing ironic authentication config for `[nova]` and `[cinder]`.
...