From b75545d0c683793a4210584ae88d17e71d5cb2b6 Mon Sep 17 00:00:00 2001
From: "Gupta, Sangeet (sg774j)" <sg774j@att.com>
Date: Tue, 5 Oct 2021 14:28:18 +0000
Subject: [PATCH] nova: Define service cleaner sleep time

This makes the service cleaner sleep time if any service is down
provisionable.

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

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 9f47cfa930..2be4bacecd 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.18
+version: 0.2.19
 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 07ab81cde7..7f5c344a2f 100644
--- a/nova/templates/bin/_nova-service-cleaner.sh.tpl
+++ b/nova/templates/bin/_nova-service-cleaner.sh.tpl
@@ -20,7 +20,7 @@ set -xe
 # to confirm service is still down.
 DISABLED_SVC="$(openstack compute service list -f value | grep -v 'nova-compute' | grep 'down')"
 if [ ! -z "${DISABLED_SVC}" ]; then
-  sleep $((2 * {{ .Values.conf.nova.DEFAULT.report_interval }}))
+  sleep $((2 * {{ .Values.jobs.service_cleaner.sleep_time }}))
 fi
 
 NOVA_SERVICES_TO_CLEAN="$(openstack compute service list -f value -c Binary | sort | uniq | grep -v '^nova-compute$')"
diff --git a/nova/values.yaml b/nova/values.yaml
index 1826eaa9d4..d730e1c8d0 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -111,6 +111,7 @@ jobs:
     history:
       success: 3
       failed: 1
+    sleep_time: 60
   archive_deleted_rows:
     cron: "0 */1 * * *"
     starting_deadline: 600
@@ -1439,7 +1440,6 @@ conf:
       instance_usage_audit_period: hour
       notify_on_state_change: vm_and_task_state
       resume_guests_state_on_host_boot: True
-      report_interval: 10
     vnc:
       novncproxy_host: 0.0.0.0
       vncserver_listen: 0.0.0.0
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 77db078954..a6b595d6d6 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -39,4 +39,5 @@ nova:
   - 0.2.16 Remove the policy document in values file
   - 0.2.17 Fix disablement of helm.sh/hook for Helm v2
   - 0.2.18 Give service time to restore
+  - 0.2.19 Define service cleaner sleep time
 ...