From f498f203cfad40c6a4f59dae07fa597087659712 Mon Sep 17 00:00:00 2001
From: "Gupta, Sangeet (sg774j)" <sg774j@att.com>
Date: Thu, 22 Apr 2021 13:19:46 +0000
Subject: [PATCH] Keystone: Fix error - wrong number of args for set

Change-Id: Ibc06d00f659c9ae7a1a14d1b2aa70607842b2f53
---
 keystone/Chart.yaml                 | 2 +-
 keystone/templates/job-db-init.yaml | 4 ++--
 releasenotes/notes/keystone.yaml    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index fb152510b3..362df9fa90 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Keystone
 name: keystone
-version: 0.1.12
+version: 0.1.13
 home: https://docs.openstack.org/keystone/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
 sources:
diff --git a/keystone/templates/job-db-init.yaml b/keystone/templates/job-db-init.yaml
index 64064ce256..6f91176b12 100644
--- a/keystone/templates/job-db-init.yaml
+++ b/keystone/templates/job-db-init.yaml
@@ -18,9 +18,9 @@ helm.sh/hook-weight: "-5"
 {{- end }}
 
 {{- if .Values.manifests.job_db_init }}
-{{- $dbInitJob := dict "envAll" . "serviceName" "keystone" -}}
+{{- $dbInitJob := dict "envAll" . "serviceName" "keystone" "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}}
 {{- if .Values.manifests.certificates -}}
-{{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}}
+{{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}}
 {{- end -}}
 {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }}
 {{- end }}
diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml
index bad3be4adb..ef6ae96789 100644
--- a/releasenotes/notes/keystone.yaml
+++ b/releasenotes/notes/keystone.yaml
@@ -13,4 +13,5 @@ keystone:
   - 0.1.10 Update RBAC apiVersion from /v1beta1 to /v1
   - 0.1.11 Remove congress residue
   - 0.1.12 Add helm hook conditional
+  - 0.1.13 Fix Error - wrong number of args for set
 ...