From 488481c332642ae1f45283d6783fac6715dd6f3b Mon Sep 17 00:00:00 2001
From: "Ritchie, Frank (fr801x)" <fr801x@att.com>
Date: Wed, 8 Nov 2023 15:53:20 -0500
Subject: [PATCH] Ability to add extra commands for service cleaner

This PS makes to possible to add extra commands to the nova service
cleaner job if needed.

Change-Id: Ic1dee3e15a5b56712128142e054e0ca2813944bf
---
 nova/Chart.yaml                                 | 2 +-
 nova/templates/bin/_nova-service-cleaner.sh.tpl | 4 ++++
 nova/values.yaml                                | 1 +
 releasenotes/notes/nova.yaml                    | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 289aa72109..0b8954c7ee 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.3.28
+version: 0.3.29
 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/_nova-service-cleaner.sh.tpl b/nova/templates/bin/_nova-service-cleaner.sh.tpl
index 22427576e8..978ca6d0ff 100644
--- a/nova/templates/bin/_nova-service-cleaner.sh.tpl
+++ b/nova/templates/bin/_nova-service-cleaner.sh.tpl
@@ -30,3 +30,7 @@ for NOVA_SERVICE in ${NOVA_SERVICES_TO_CLEAN}; do
     openstack compute service delete "${SERVICE_ID}"
   done
 done
+
+{{- if .Values.jobs.service_cleaner.extra_command }}
+{{ .Values.jobs.service_cleaner.extra_command }}
+{{- end }}
diff --git a/nova/values.yaml b/nova/values.yaml
index 0472147038..2634d13c7a 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -109,6 +109,7 @@ jobs:
       success: 3
       failed: 1
     sleep_time: 60
+    extra_command: null
   archive_deleted_rows:
     cron: "0 */1 * * *"
     starting_deadline: 600
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 479f58336d..8c94c40a1b 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -97,4 +97,5 @@ nova:
   - 0.3.26 Improve cinder authentication support
   - 0.3.27 Add 2023.2 Ubuntu Jammy overrides
   - 0.3.28 Add ability to define extra command(s) for the nova cell setup job
+  - 0.3.29 Add ability to define extra command(s) for the nova service cleaner job
 ...