From adab36be22ae1607850240d04cc0eeea366d8be1 Mon Sep 17 00:00:00 2001
From: "Haider, Nafiz (nh532m)" <nafizhaider22@gmail.com>
Date: Thu, 8 Jul 2021 14:38:25 -0400
Subject: [PATCH] Helm-Toolkit: Make Rabbit-init job more robust

Change-Id: I36ef7b2cdcf747ed2503ca5d27bc7803349f287d
---
 helm-toolkit/Chart.yaml                                    | 2 +-
 helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl | 2 +-
 releasenotes/notes/helm-toolkit.yaml                       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml
index d13bdbc3ae..4f10b0b713 100644
--- a/helm-toolkit/Chart.yaml
+++ b/helm-toolkit/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Helm-Toolkit
 name: helm-toolkit
-version: 0.2.17
+version: 0.2.18
 home: https://docs.openstack.org/openstack-helm
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
 sources:
diff --git a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
index 55740322a4..d003f123f5 100644
--- a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
@@ -94,7 +94,7 @@ spec:
           - name: RABBITMQ_AUXILIARY_CONFIGURATION
             value: {{ toJson $envAll.Values.conf.rabbitmq | quote }}
 {{- end }}
-{{- if $envAll.Values.manifests.certificates }}
+{{- if and $envAll.Values.manifests.certificates (ne $tlsSecret "") }}
           - name: RABBITMQ_X509
             value: "REQUIRE X509"
           - name: USER_CERT_PATH
diff --git a/releasenotes/notes/helm-toolkit.yaml b/releasenotes/notes/helm-toolkit.yaml
index c3ba67b7ad..c4189d5d7c 100644
--- a/releasenotes/notes/helm-toolkit.yaml
+++ b/releasenotes/notes/helm-toolkit.yaml
@@ -24,4 +24,5 @@ helm-toolkit:
   - 0.2.15 Adding TLS rabbitmq logic
   - 0.2.16 Add manual mode to the created backup file name
   - 0.2.17 Update db backup/restore retry for sending to remote
+  - 0.2.18 Make Rabbit-init job more robust
 ...