From c6d09af67626c2f2241c64c10c9e27e8752ba87b Mon Sep 17 00:00:00 2001
From: chengcheng-chcheng
 <63850735+chengcheng-chcheng@users.noreply.github.com>
Date: Wed, 10 Jun 2020 00:20:47 +0800
Subject: When tools.conf does not exist, running cmd "vmware-toolbox-cmd
 config get deployPkg enable-custom-scripts", the return code will be
 EX_UNAVAILABLE(69), on this condition, it should not take it as error. (#413)

---
 .../sources/helpers/vmware/imc/guestcust_util.py   | 31 +++++++++++++---------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'cloudinit/sources/helpers/vmware')

diff --git a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
index 893b1365..d919f693 100644
--- a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
+++ b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
@@ -133,23 +133,30 @@ def get_tools_config(section, key, defaultVal):
             'vmware-toolbox-cmd not installed, returning default value')
         return defaultVal
 
-    retValue = defaultVal
     cmd = ['vmware-toolbox-cmd', 'config', 'get', section, key]
 
     try:
         (outText, _) = subp.subp(cmd)
-        m = re.match(r'([^=]+)=(.*)', outText)
-        if m:
-            retValue = m.group(2).strip()
-            logger.debug("Get tools config: [%s] %s = %s",
-                         section, key, retValue)
-        else:
-            logger.debug(
-                "Tools config: [%s] %s is not found, return default value: %s",
-                section, key, retValue)
     except subp.ProcessExecutionError as e:
-        logger.error("Failed running %s[%s]", cmd, e.exit_code)
-        logger.exception(e)
+        if e.exit_code == 69:
+            logger.debug(
+                "vmware-toolbox-cmd returned 69 (unavailable) for cmd: %s."
+                " Return default value: %s", " ".join(cmd), defaultVal)
+        else:
+            logger.error("Failed running %s[%s]", cmd, e.exit_code)
+            logger.exception(e)
+        return defaultVal
+
+    retValue = defaultVal
+    m = re.match(r'([^=]+)=(.*)', outText)
+    if m:
+        retValue = m.group(2).strip()
+        logger.debug("Get tools config: [%s] %s = %s",
+                     section, key, retValue)
+    else:
+        logger.debug(
+            "Tools config: [%s] %s is not found, return default value: %s",
+            section, key, retValue)
 
     return retValue
 
-- 
cgit v1.2.3