Merge ~smoser/cloud-init:bug/disable_vmware_customization-fix into cloud-init:master

[Scott Moser]

[Sankar Tanguturi (sankaraditya)]

Awesome. Thanks Scott.

I have only one minor nit. In the commit message, can you also add a comment that /etc/cloud/cloud.cfg is also being used to check for the flag besides /etc/cloud/cloud.cfg.d/*

Thanks

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:cd32185dd161dd8c8e194e34d1bca1fc892490a5
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/318493/+edit-commit-message

https://jenkins.ubuntu.com/server/job/cloud-init-ci/67/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/67
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/67
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/67
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-amd64/67
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/67

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/67/rebuild

review: Needs Fixing (continuous-integration)

diff --git a/tools/ds-identify b/tools/ds-identify
index 34bf064..e618963 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -574,16 +574,17 @@ ovf_vmware_guest_customization() {
     done
     [ -n "$found" ] || return 1
 
-    # disable_vmware_customization defaults to False.
-    # any value then other than false means disabled.
+    # vmware customization is disabled by default
+    # (disable_vmware_customization=true). If it is set to false, then
+    # user has requested customization.
     local key="disable_vmware_customization"
     local match="" bp="${PATH_CLOUD_CONFD}/cloud.cfg"
-    match="$bp.d/*[Oo][Vv][Ff]*.cfg"
+    match="$bp $bp.d/*[Oo][Vv][Ff]*.cfg"
     if check_config "$key" "$match"; then
         debug 2 "${_RET_fname} set $key to $_RET"
         case "$_RET" in
             0|false|False) return 0;;
-            *) return;;
+            *) return 1;;
         esac
     fi