From 00632d7163d12cdc3f22e19ae4772f7f6ccbdc36 Mon Sep 17 00:00:00 2001
From: Robert Nickel <72467967+halfdime-code@users.noreply.github.com>
Date: Mon, 29 Jul 2024 10:53:37 -0700
Subject: [PATCH] feat(ec2): Bump url_max_timeout to 240s from 120s.

Initialization of IMDS is periodically exceeding the 120s limit on
instance launch. Increase the timeout to allow for this variance.

Update docs to reflect change.
---
 cloudinit/sources/DataSourceEc2.py        | 2 +-
 doc/examples/cloud-config-datasources.txt | 2 +-
 tools/.github-cla-signers                 | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
index e1ab1c5fe034..7e0e600d281b 100644
--- a/cloudinit/sources/DataSourceEc2.py
+++ b/cloudinit/sources/DataSourceEc2.py
@@ -88,7 +88,7 @@ class DataSourceEc2(sources.DataSource):
     ]
 
     # Setup read_url parameters per get_url_params.
-    url_max_wait = 120
+    url_max_wait = 240
     url_timeout = 50
 
     _api_token = None  # API token for accessing the metadata service
diff --git a/doc/examples/cloud-config-datasources.txt b/doc/examples/cloud-config-datasources.txt
index fd95b3a81fb0..2922181dccb8 100644
--- a/doc/examples/cloud-config-datasources.txt
+++ b/doc/examples/cloud-config-datasources.txt
@@ -9,7 +9,7 @@ datasource:
     # The length in seconds to wait before giving up on the metadata
     # service.  The actual total wait could be up to 
     #   len(resolvable_metadata_urls)*timeout
-    max_wait : 120
+    max_wait : 240
 
     #metadata_url: a list of URLs to check for metadata services
     metadata_urls:
diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers
index 80872dcb5087..0f05c861c7d6 100644
--- a/tools/.github-cla-signers
+++ b/tools/.github-cla-signers
@@ -74,6 +74,7 @@ garzdin
 giggsoff
 gilbsgilbs
 glyg
+halfdime-code
 hamalq
 hcartiaux
 holmanb