commit 73b9629ea2930f804d20990fd270a9f8c260fbc6 Author: Michael Polenchuk Date: Mon Sep 21 10:53:51 2020 +0400 [cinder] Support service tokens Bring in option to be able to create and send service tokens to prevent long-running job failures (default is OFF). Change-Id: I5e5707001687e464386696b9c8d80ad8b2977e97 diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml index f09ca2f..1517c1f 100644 --- a/cinder/Chart.yaml +++ b/cinder/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Cinder name: cinder -version: 0.1.1 +version: 0.1.2 home: https://docs.openstack.org/cinder/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png sources: diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml index 13ebcac..ee84bbd 100644 --- a/cinder/templates/configmap-etc.yaml +++ b/cinder/templates/configmap-etc.yaml @@ -97,6 +97,30 @@ limitations under the License. {{- $_ := tuple "volume" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.cinder.DEFAULT "osapi_volume_listen_port" -}} {{- end -}} +{{- if .Values.conf.cinder.service_user.send_service_user_token -}} +{{- if empty .Values.conf.cinder.service_user.auth_url -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.cinder.service_user "auth_url" -}} +{{- end -}} +{{- if empty .Values.conf.cinder.service_user.region_name -}} +{{- $_ := set .Values.conf.cinder.service_user "region_name" .Values.endpoints.identity.auth.cinder.region_name -}} +{{- end -}} +{{- if empty .Values.conf.cinder.service_user.project_name -}} +{{- $_ := set .Values.conf.cinder.service_user "project_name" .Values.endpoints.identity.auth.cinder.project_name -}} +{{- end -}} +{{- if empty .Values.conf.cinder.service_user.project_domain_name -}} +{{- $_ := set .Values.conf.cinder.service_user "project_domain_name" .Values.endpoints.identity.auth.cinder.project_domain_name -}} +{{- end -}} +{{- if empty .Values.conf.cinder.service_user.user_domain_name -}} +{{- $_ := set .Values.conf.cinder.service_user "user_domain_name" .Values.endpoints.identity.auth.cinder.user_domain_name -}} +{{- end -}} +{{- if empty .Values.conf.cinder.service_user.username -}} +{{- $_ := set .Values.conf.cinder.service_user "username" .Values.endpoints.identity.auth.cinder.username -}} +{{- end -}} +{{- if empty .Values.conf.cinder.service_user.password -}} +{{- $_ := set .Values.conf.cinder.service_user "password" .Values.endpoints.identity.auth.cinder.password -}} +{{- end -}} +{{- end -}} + {{- if and (empty .Values.conf.logging.handler_fluent) (has "fluent" .Values.conf.logging.handlers.keys) -}} {{- $fluentd_host := tuple "fluentd" "internal" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }} {{- $fluentd_port := tuple "fluentd" "internal" "service" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }} diff --git a/cinder/values.yaml b/cinder/values.yaml index ca4e26e..422cb8a 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -914,6 +914,9 @@ conf: rabbit_ha_queues: true coordination: backend_url: file:///var/lib/cinder/coordination + service_user: + auth_type: password + send_service_user_token: false logging: loggers: keys: