From be0c4c25f7941881054ea2aaecc197fcd1dc7cce Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 21 Feb 2021 18:26:12 +0900
Subject: [PATCH] Make default of NovaSyncPowerStateInterval consistent with
 nova

Currently default of the NovaSyncPowerStateInterval parameter is 0, but
this makes the parameter use the default value defined in oslo.service
(which is 60 seconds) instead of the default defined in nova(which is
600 seconds).
Because it is more reasonable to use the default defined in service
itlself, this change updates the default of that parameter to be
consistent with the default defined in nova.

Closes-Bug: #1916380
Change-Id: I4bc97cc3f361b5ada15fee81ccc1036485d4529c
(cherry picked from commit 5ff2741130bcfeee18563eb8e0da86396e1cb10c)
---
 deployment/nova/nova-base-puppet.yaml                       | 5 +++--
 ...-of-nova-sync-power-state-interval-90778dbcb0104130.yaml | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/fix-default-of-nova-sync-power-state-interval-90778dbcb0104130.yaml

diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml
index c555248727..d62ca533b0 100644
--- a/deployment/nova/nova-base-puppet.yaml
+++ b/deployment/nova/nova-base-puppet.yaml
@@ -93,8 +93,9 @@ parameters:
    type: number
    description:
      Interval to sync power states between the database and the hypervisor. Set
-     to -1 to disable. Setting this to 0 will run at the default rate.
-   default: 0
+     to -1 to disable. Setting this to 0 will run at the default rate(60)
+     defined in oslo.service.
+   default: 600
   RpcUseSSL:
     default: false
     description: >
diff --git a/releasenotes/notes/fix-default-of-nova-sync-power-state-interval-90778dbcb0104130.yaml b/releasenotes/notes/fix-default-of-nova-sync-power-state-interval-90778dbcb0104130.yaml
new file mode 100644
index 0000000000..5803332b04
--- /dev/null
+++ b/releasenotes/notes/fix-default-of-nova-sync-power-state-interval-90778dbcb0104130.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Default of the ``NovaSyncPowerStateInterval`` parameter has been changed
+    from 0 to 600, to use the default value consistent with the one defined in
+    nova.