From e4fffb30e5cfb8200c34612bcb8463a2f33cb6b0 Mon Sep 17 00:00:00 2001
From: "xuxant02@gmail.com" <xuxant02@gmail.com>
Date: Tue, 21 Sep 2021 11:42:20 +0545
Subject: [PATCH] Fix for before option in archive_deleted_rows

Script fails with too many arguments when provided command like "$(date -d 'now - 2 days')" as the value for --before option. Addition of quotes fix the issue.

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

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 3979a9a2..69d49e9d 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.14
+version: 0.2.15
 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 5e4f4481..a4b986bf 100644
--- a/nova/templates/bin/_db-archive-deleted-row.sh.tpl
+++ b/nova/templates/bin/_db-archive-deleted-row.sh.tpl
@@ -30,6 +30,6 @@ exec nova-manage db archive_deleted_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 2b748c1e..1a698be6 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -35,4 +35,5 @@ nova:
   - 0.2.12 Bootstrap flavor creation efficiencies
   - 0.2.13 Add missing 'runlock' hostMount when enable_scsi
   - 0.2.14 Use helm.sh/hook annotations for jobs
+  - 0.2.15 Fix archive-deleted-rows for enabling date command as value for before option
 ...