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

Proposed by Dan Watkins on 2017-04-14
Status: Merged
Approved by: Scott Moser on 2017-04-15
Approved revision: 169a7105a25a27ee894af63cd8b5bcc3ded6fd2e
Merged at revision: 169a7105a25a27ee894af63cd8b5bcc3ded6fd2e
Proposed branch: ~daniel-thewatkins/cloud-init/+git/cloud-init:dsidentify_configdrive_latest
Merge into: cloud-init:master
Diff against target: 21 lines (+3/-2)
1 file modified
tools/ds-identify (+3/-2)
Reviewer Review Type Date Requested Status
Scott Moser 2017-04-14 Approve on 2017-04-15
Server Team CI bot continuous-integration Needs Fixing on 2017-04-14
Review via email: mp+322598@code.launchpad.net

Commit message

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

To post a comment you must log in.

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) wrote :

Dan. Go ahead and commit.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/ds-identify b/tools/ds-identify
2index 5d390ef..a40b14d 100755
3--- a/tools/ds-identify
4+++ b/tools/ds-identify
5@@ -552,13 +552,14 @@ check_configdrive_v2() {
6 # look in /config-drive <vlc>/seed/config_drive for a directory
7 # openstack/YYYY-MM-DD format with a file meta_data.json
8 local d=""
9- for d in /config-drive "${PATH_VAR_LIB_CLOUD}/seed/config_drive"; do
10+ local vlc_config_drive_path="${PATH_VAR_LIB_CLOUD}/seed/config_drive"
11+ for d in /config-drive $vlc_config_drive_path; do
12 set +f; set -- "$d/openstack/"2???-??-??/meta_data.json; set -f;
13 [ -f "$1" ] && return ${DS_FOUND}
14 done
15 # at least one cloud (softlayer) seeds config drive with only 'latest'.
16 local lpath="openstack/latest/meta_data.json"
17- if [ -e "${PATH_VAR_LIB_CLOUD}/$lpath" ]; then
18+ if [ -e "$vlc_config_drive_path/$lpath" ]; then
19 debug 1 "config drive seeded directory had only 'latest'"
20 return ${DS_FOUND}
21 fi

Subscribers

People subscribed via source and target branches