From d7524be95967219c79cbecb2cc7dc2231852e5c9 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 17 Sep 2021 17:02:14 +0200 Subject: [PATCH] Fix db connection key name in DEFAULT config Change-Id: I7c31d2f036e7088564fd947e5979dd34c283f768 --- barbican/Chart.yaml | 2 +- barbican/templates/configmap-etc.yaml | 2 +- releasenotes/notes/barbican.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml index e71b3e8d26..ac164d8111 100644 --- a/barbican/Chart.yaml +++ b/barbican/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Barbican name: barbican -version: 0.2.6 +version: 0.2.7 home: https://docs.openstack.org/barbican/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png sources: diff --git a/barbican/templates/configmap-etc.yaml b/barbican/templates/configmap-etc.yaml index 44b37fa715..c8e08cb121 100644 --- a/barbican/templates/configmap-etc.yaml +++ b/barbican/templates/configmap-etc.yaml @@ -54,7 +54,7 @@ limitations under the License. {{- 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" -}} {{- else -}} -{{- $_ := set .Values.conf.barbican.DEFAULT "connection" $connection -}} +{{- $_ := set .Values.conf.barbican.DEFAULT "sql_connection" $connection -}} {{- end -}} {{- end -}} diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml index 17dbf75852..b999250ea6 100644 --- a/releasenotes/notes/barbican.yaml +++ b/releasenotes/notes/barbican.yaml @@ -10,4 +10,5 @@ barbican: - 0.2.4 Add Ussuri release support - 0.2.5 Add Victoria and Wallaby releases support - 0.2.6 Allow Barbican to talk to Mariadb over TLS + - 0.2.7 Fix db connection key name ...