[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 b950f6cf8a36c68b4b026cf32647a8b18b369c6a..cad1563b6d3f15fe0ef5894eb253ce6c31637072 100644 (file)
--- 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 82c5b5259a424871aea34442c969af3a2ee91015..b1f0324bfd572cb8dcbbd926e0777b8a952b07e1 100644 (file)
--- 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);