openstack/openstack-helm
Code Issues Proposed changes

Merge "Fix db connection key name in DEFAULT config"

Browse Source
This commit is contained in:
Zuul 2021-09-19 23:35:34 +00:00 committed by Gerrit Code Review
commit 54da75fd71
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barbican/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Barbican description: OpenStack-Helm Barbican
name: barbican name: barbican
version: 0.2.6 version: 0.2.7
home: https://docs.openstack.org/barbican/latest/ home: https://docs.openstack.org/barbican/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
sources: sources:

2
barbican/templates/configmap-etc.yaml
View File

@ -54,7 +54,7 @@ limitations under the License.
{{- if .Values.manifests.certificates -}} {{- if .Values.manifests.certificates -}}
{{- $_ := (printf "%s?charset=utf8&ssl_ca=/etc/mysql/certs/ca.crt&ssl_key=/etc/mysql/certs/tls.key&ssl_cert=/etc/mysql/certs/tls.crt&ssl_verify_cert" $connection ) | set .Values.conf.barbican.DEFAULT "sql_connection" -}} {{- $_ := (printf "%s?charset=utf8&ssl_ca=/etc/mysql/certs/ca.crt&ssl_key=/etc/mysql/certs/tls.key&ssl_cert=/etc/mysql/certs/tls.crt&ssl_verify_cert" $connection ) | set .Values.conf.barbican.DEFAULT "sql_connection" -}}
{{- else -}} {{- else -}}
{{- $_ := set .Values.conf.barbican.DEFAULT "connection" $connection -}} {{- $_ := set .Values.conf.barbican.DEFAULT "sql_connection" $connection -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

1
releasenotes/notes/barbican.yaml
View File

@ -10,4 +10,5 @@ barbican:
- 0.2.4 Add Ussuri release support - 0.2.4 Add Ussuri release support
- 0.2.5 Add Victoria and Wallaby releases support - 0.2.5 Add Victoria and Wallaby releases support
- 0.2.6 Allow Barbican to talk to Mariadb over TLS - 0.2.6 Allow Barbican to talk to Mariadb over TLS
- 0.2.7 Fix db connection key name
... ...