From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 13 Sep 2022 17:31:14 +0000 (-0700)
Subject: [deployPkg] Increase the maximum timeout for cloud-init execution to complete.
X-Git-Tag: stable-12.2.0~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=064033a0ea74599d93f2a9988e0331efbe8f981f;p=thirdparty%2Fopen-vm-tools.git

[deployPkg] Increase the maximum timeout for cloud-init execution to complete.
---

diff --git a/open-vm-tools/lib/include/conf.h b/open-vm-tools/lib/include/conf.h
index b950f6cf8..cad1563b6 100644
--- a/open-vm-tools/lib/include/conf.h
+++ b/open-vm-tools/lib/include/conf.h
@@ -589,7 +589,7 @@
 
 /**
  * How long does guest customization wait until cloud-init execution done
- * Valid value range: 0 ~ 600
+ * Valid value range: 0 ~ 1800
  */
 #define CONFNAME_DEPLOYPKG_WAIT_CLOUDINIT_TIMEOUT "wait-cloudinit-timeout"
 
diff --git a/open-vm-tools/services/plugins/deployPkg/deployPkg.c b/open-vm-tools/services/plugins/deployPkg/deployPkg.c
index 82c5b5259..b1f0324bf 100644
--- a/open-vm-tools/services/plugins/deployPkg/deployPkg.c
+++ b/open-vm-tools/services/plugins/deployPkg/deployPkg.c
@@ -59,9 +59,9 @@ using namespace ImgCustCommon;
 
 // Using 3600s as the upper limit of timeout value in tools.conf.
 #define MAX_TIMEOUT_FROM_TOOLCONF 3600
-// Using 600s as the upper limit of waiting for cloud-init execution done
+// Using 1800s as the upper limit of waiting for cloud-init execution done
 // timeout value in tools.conf.
-#define MAX_TIMEOUT_WAIT_FOR_CLOUDINIT_DONE 600
+#define MAX_TIMEOUT_WAIT_FOR_CLOUDINIT_DONE 1800
 
 static char *DeployPkgGetTempDir(void);