Merge "fix(cinder): add endpoint details for nova"
This commit is contained in:
commit
2d92a0c9c9
@ -14,7 +14,7 @@ apiVersion: v1
|
||||
appVersion: v1.0.0
|
||||
description: OpenStack-Helm Cinder
|
||||
name: cinder
|
||||
version: 0.3.4
|
||||
version: 0.3.5
|
||||
home: https://docs.openstack.org/cinder/latest/
|
||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
|
||||
sources:
|
||||
|
@ -49,6 +49,29 @@ limitations under the License.
|
||||
{{- $_ := set .Values.conf.cinder.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if empty $envAll.Values.conf.cinder.nova.auth_url -}}
|
||||
{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.cinder.nova "auth_url" -}}
|
||||
{{- end }}
|
||||
|
||||
{{- if empty $envAll.Values.conf.cinder.nova.region_name -}}
|
||||
{{- $_ := set $envAll.Values.conf.cinder.nova "region_name" $envAll.Values.endpoints.identity.auth.cinder.region_name -}}
|
||||
{{- end -}}
|
||||
{{- if empty $envAll.Values.conf.cinder.nova.project_name -}}
|
||||
{{- $_ := set $envAll.Values.conf.cinder.nova "project_name" $envAll.Values.endpoints.identity.auth.cinder.project_name -}}
|
||||
{{- end -}}
|
||||
{{- if empty $envAll.Values.conf.cinder.nova.project_domain_name -}}
|
||||
{{- $_ := set $envAll.Values.conf.cinder.nova "project_domain_name" $envAll.Values.endpoints.identity.auth.cinder.project_domain_name -}}
|
||||
{{- end -}}
|
||||
{{- if empty $envAll.Values.conf.cinder.nova.user_domain_name -}}
|
||||
{{- $_ := set $envAll.Values.conf.cinder.nova "user_domain_name" $envAll.Values.endpoints.identity.auth.cinder.user_domain_name -}}
|
||||
{{- end -}}
|
||||
{{- if empty $envAll.Values.conf.cinder.nova.username -}}
|
||||
{{- $_ := set $envAll.Values.conf.cinder.nova "username" $envAll.Values.endpoints.identity.auth.cinder.username -}}
|
||||
{{- end -}}
|
||||
{{- if empty $envAll.Values.conf.cinder.nova.password -}}
|
||||
{{- $_ := set $envAll.Values.conf.cinder.nova "password" $envAll.Values.endpoints.identity.auth.cinder.password -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if empty .Values.conf.cinder.database.connection -}}
|
||||
{{- $connection := tuple "oslo_db" "internal" "cinder" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" -}}
|
||||
{{- if .Values.manifests.certificates -}}
|
||||
|
@ -826,6 +826,10 @@ conf:
|
||||
auth_version: v3
|
||||
auth_type: password
|
||||
memcache_security_strategy: ENCRYPT
|
||||
nova:
|
||||
auth_type: password
|
||||
auth_version: v3
|
||||
interface: internal
|
||||
oslo_policy:
|
||||
policy_file: /etc/cinder/policy.yaml
|
||||
oslo_concurrency:
|
||||
|
@ -54,4 +54,5 @@ cinder:
|
||||
- 0.3.2 Remove default policy rules
|
||||
- 0.3.3 Fix for creation endpoins and services when v1/v2 are disabled
|
||||
- 0.3.4 Fix Helm hooks for storage bootstrap jobs
|
||||
- 0.3.5 Add Nova endpoint details to support online volume resize
|
||||
...
|
||||
|
Loading…
x
Reference in New Issue
Block a user