From 5dceb018608734335d65c527d12fa3c70c117912 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 23 Nov 2020 09:27:52 +0800
Subject: [PATCH] Allow db sync timeouts to be configurable

As Openstack projects continue to have longer database migration
chains, the Puppet default timeout of 300 seconds for an execution
is becoming too short a duration on some hardware, leading to timeouts.
As projects continue to add more migration scripts without pruning
the base, timeouts will continue to become more frequent unless
this time can be expanded.

Change-Id: If98c83c16e981353780573f6f0f0f737f1374ba1
Closes-Bug: #1904962
---
 manifests/db/sync.pp                                  | 11 ++++++++++-
 .../notes/add_db_sync_timeout-9752b1d54915498c.yaml   |  3 +++
 spec/classes/placement_db_sync_spec.rb                |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/add_db_sync_timeout-9752b1d54915498c.yaml

diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 8e79bbc..f7b839e 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -1,7 +1,15 @@
 #
 # Class to execute placement-manage db sync
 #
-class placement::db::sync {
+# ==Parameters
+#
+# [*db_sync_timeout*]
+#   (Optional) Timeout for the execution of the db_sync
+#   Defaults to 300
+#
+class placement::db::sync(
+  $db_sync_timeout = 300,
+) {
 
   include placement::deps
 
@@ -12,6 +20,7 @@ class placement::db::sync {
     refreshonly => true,
     try_sleep   => 5,
     tries       => 10,
+    timeout     => $db_sync_timeout,
     logoutput   => on_failure,
     subscribe   => [
       Anchor['placement::install::end'],
diff --git a/releasenotes/notes/add_db_sync_timeout-9752b1d54915498c.yaml b/releasenotes/notes/add_db_sync_timeout-9752b1d54915498c.yaml
new file mode 100644
index 0000000..233445f
--- /dev/null
+++ b/releasenotes/notes/add_db_sync_timeout-9752b1d54915498c.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Adds db_sync_timeout parameter to db sync.
diff --git a/spec/classes/placement_db_sync_spec.rb b/spec/classes/placement_db_sync_spec.rb
index c3356df..25d4a29 100644
--- a/spec/classes/placement_db_sync_spec.rb
+++ b/spec/classes/placement_db_sync_spec.rb
@@ -11,6 +11,7 @@ describe 'placement::db::sync' do
       :refreshonly => 'true',
       :try_sleep   => 5,
       :tries       => 10,
+      :timeout     => 300,
       :user        => 'placement',
       :logoutput   => 'on_failure',
       :subscribe   => ['Anchor[placement::install::end]',