starlingx/integ
Code Issues Proposed changes

Increase timeout for openstack commands

Browse Source 
This commit adds a patch to the puppet-openstacklib module.

This puppet module is used by the bootstrap manifest to execute
openstack commands. After the change to debian, this 40s timeout
is not enough for some types of hardware.

Note: Further investigation is being done to understand why some
hardware is much slower on debian.

Test Plan:

PASS: Verify that installing a subcloud with redfish executes cleanly,
      the subcloud reaches online status and verify that the puppet
      bootstrap manifest runs without the openstack timeout error.

Closes-Bug: 1993585

Signed-off-by: Rei Oliveira <Reinildes.JoseMateusOliveira@windriver.com>
Change-Id: I3df79f2f6b7b5900808978914779cfe0c9949d72
This commit is contained in:
Rei Oliveira 2022-10-19 13:08:12 -03:00
parent bced15251c
commit 5ffae5c838
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
config/puppet-modules/openstack/puppet-openstacklib-17.4.0/debian/patches/0004-Increase-timeout-from-40s-to-100s.patch Normal file
View File

@ -0,0 +1,30 @@
From e9bc8f6deda0e76d6f02f9e19e19ef95c1aa07e1 Mon Sep 17 00:00:00 2001
From: Rei Oliveira <Reinildes.JoseMateusOliveira@windriver.com>
Date: Wed, 19 Oct 2022 12:54:01 -0300
Subject: [PATCH] Increase timeout from 40s to 100s
This puppet module is used by the bootstrap manifest to execute
openstack commands. After the change to debian, this 40s timeout
is not enough for some types of hardware.
Signed-off-by: Rei Oliveira <Reinildes.JoseMateusOliveira@windriver.com>
---
lib/puppet/provider/openstack.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb
index 3d80d68..fe63b79 100644
--- a/lib/puppet/provider/openstack.rb
+++ b/lib/puppet/provider/openstack.rb
@@ -14,7 +14,7 @@ class Puppet::Provider::Openstack < Puppet::Provider
commands :openstack_command => 'openstack'
@@no_retry_actions = %w(create remove delete)
- @@command_timeout = 40
+ @@command_timeout = 100
# Fails on the 5th retry for a max of 212s (~3.5min) before total
# failure.
@@request_timeout = 170
--
2.17.1

1
config/puppet-modules/openstack/puppet-openstacklib-17.4.0/debian/patches/series
View File

@ -1,3 +1,4 @@
0001-Adapt-first-set-of-legacy-patches.patch
0002-Replace-deprecated-hiera-function.patch
0003-Adjust-puppetlabs-postgresql-version-requirement.patch
0004-Increase-timeout-from-40s-to-100s.patch