From c050456bdb19e5929a1c04cdbc859027bc744b84 Mon Sep 17 00:00:00 2001
From: "xuxant02@gmail.com" <xuxant02@gmail.com>
Date: Tue, 29 Jun 2021 21:38:04 +0545
Subject: [PATCH] Fix for the values in archive_delete_rows script

There was a mistake in the script for the archive_delete_rows cron for
rendering the values from the values files. Fix for taking the values
from the values file for --max-rows and --before options when enabled
using the values.yaml file.

Change-Id: Ib63920c497bbf9ac74e41bdfd0b2e580b95bebb0
---
 nova/Chart.yaml                                   | 2 +-
 nova/templates/bin/_db-archive-deleted-row.sh.tpl | 4 ++--
 releasenotes/notes/nova.yaml                      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 945438de1f..66fc617578 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.2.7
+version: 0.2.8
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/bin/_db-archive-deleted-row.sh.tpl b/nova/templates/bin/_db-archive-deleted-row.sh.tpl
index 21369b3a27..5e4f448162 100644
--- a/nova/templates/bin/_db-archive-deleted-row.sh.tpl
+++ b/nova/templates/bin/_db-archive-deleted-row.sh.tpl
@@ -27,9 +27,9 @@ exec nova-manage db archive_deleted_rows \
    --all-cells \
 {{- end}}
 {{- if .Values.conf.archive_deleted_rows.max_rows.enabled }}
-   --max_rows .Values.conf.archive_deleted_rows.max_rows.rows \
+   --max_rows {{ .Values.conf.archive_deleted_rows.max_rows.rows }} \
 {{- end }}
 {{- if .Values.conf.archive_deleted_rows.before.enabled }}
-   --before .Values.conf.archive_deleted_rows.before.date \
+   --before {{ .Values.conf.archive_deleted_rows.before.date }} \
 {{- end }}
    --verbose
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index a55e8f8f65..1f9daaaf36 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -28,4 +28,5 @@ nova:
   - 0.2.5 Set reasonable default probe timeouts
   - 0.2.6 Added cronJob with script for archive deleted rows which cleanup databases
   - 0.2.7 Add Ussuri release support
+  - 0.2.8 Fix the cron archive_deleted_rows bash script for before and max-rows values
 ...