Merge ~oddbloke/cloud-init/+git/cloud-init:dsidentify_configdrive_latest into cloud-init:master

[Dan Watkins]

ds-identify: Check correct path for "latest" config drive

We were checking /var/lib/cloud/openstack/latest/meta_data.json instead
of /var/lib/cloud/seed/config_drive/openstack/latest/meta_data.json.

LP: #1673637

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

FAILED: Continuous integration, rev:169a7105a25a27ee894af63cd8b5bcc3ded6fd2e
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/~daniel-thewatkins/cloud-init/+git/cloud-init/+merge/322598/+edit-commit-message

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

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

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

Dan. Go ahead and commit.

review: Approve

diff --git a/tools/ds-identify b/tools/ds-identify
index 5d390ef..a40b14d 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -552,13 +552,14 @@ check_configdrive_v2() {
     # look in /config-drive <vlc>/seed/config_drive for a directory
     # openstack/YYYY-MM-DD format with a file meta_data.json
     local d=""
-    for d in /config-drive "${PATH_VAR_LIB_CLOUD}/seed/config_drive"; do
+    local vlc_config_drive_path="${PATH_VAR_LIB_CLOUD}/seed/config_drive"
+    for d in /config-drive $vlc_config_drive_path; do
         set +f; set -- "$d/openstack/"2???-??-??/meta_data.json; set -f;
         [ -f "$1" ] && return ${DS_FOUND}
     done
     # at least one cloud (softlayer) seeds config drive with only 'latest'.
     local lpath="openstack/latest/meta_data.json"
-    if [ -e "${PATH_VAR_LIB_CLOUD}/$lpath" ]; then
+    if [ -e "$vlc_config_drive_path/$lpath" ]; then
         debug 1 "config drive seeded directory had only 'latest'"
         return ${DS_FOUND}
     fi