From 4a3c87dbcd064745a0af5546c7a2ad8b1b620a46 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 15 Sep 2023 12:57:25 -0700
Subject: [PATCH] Set a six hour nodepool image upload timeout

This was the old timeout then some refactoring happened and we ended up
with the openstacksdk timeout of one hour. Since then Nodepool added the
ability to configure the timeout so we set it back to the original six
hour value.

Change-Id: I29d0fa9d0077bd8e95f68f74143b2d18dc62014b
---
 nodepool/nb04.opendev.org.yaml |  4 ++++
 nodepool/nodepool.yaml         | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/nodepool/nb04.opendev.org.yaml b/nodepool/nb04.opendev.org.yaml
index 7cc7c15714..3d8e7e2c6d 100644
--- a/nodepool/nb04.opendev.org.yaml
+++ b/nodepool/nb04.opendev.org.yaml
@@ -16,6 +16,8 @@ providers:
     region-name: 'RegionOne'
     cloud: linaro
     rate: 0.25
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: &arm64_diskimages
       - name: ubuntu-bionic-arm64
         pause: false
@@ -102,6 +104,8 @@ providers:
     region-name: 'RegionOne'
     cloud: osuosl
     rate: 0.25
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: *arm64_diskimages
 
 diskimages:
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 9ee23a0207..5da3d9dfd2 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -16,6 +16,8 @@ providers:
     region-name: 'BHS1'
     cloud: ovh
     rate: 0.1
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
@@ -52,18 +54,24 @@ providers:
     region-name: 'GRA1'
     cloud: ovh
     rate: 0.1
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: *provider_diskimages
 
   - name: rax-dfw
     region-name: 'DFW'
     cloud: rax
     rate: 0.001
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: *provider_diskimages
 
   - name: rax-iad
     region-name: 'IAD'
     cloud: rax
     rate: 0.001
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages:
       - name: centos-7
         config-drive: true
@@ -100,24 +108,32 @@ providers:
     region-name: 'ORD'
     cloud: rax
     rate: 0.001
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: *provider_diskimages
 
   - name: vexxhost-ca-ymq-1
     region-name: 'ca-ymq-1'
     cloud: vexxhost
     rate: 0.001
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: *provider_diskimages
 
   - name: vexxhost-sjc1
     region-name: 'sjc1'
     cloud: vexxhost
     rate: 0.001
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: *provider_diskimages
 
   - name: inmotion-iad3
     region-name: 'iad3'
     cloud: inmotion
     rate: 0.25
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: *provider_diskimages
 
 diskimages: