cloud-init

Merge ~smoser/cloud-init:cleanup/ds-identify-not-call-is_ds_enabled-twice into cloud-init:master

  1. Git
  2. lp:~smoser/cloud-init
  3. cleanup/ds-identify-not-call-is_ds_enabled-twice
  4. Merge into master
Proposed by Scott Moser
Status: Merged
Approved by: Chad Smith
Approved revision: b99a948b0259e9974a8d9ac5ac2da71c3295ee5d
Merge reported by: Chad Smith
Merged at revision: bde30070ec5f20aeb4d48cee8cf6c49b900ee311
Proposed branch: ~smoser/cloud-init:cleanup/ds-identify-not-call-is_ds_enabled-twice
Merge into: cloud-init:master
Diff against target: 19 lines (+5/-3)
1 file modified
tools/ds-identify (+5/-3)
Reviewer Review Type Date Requested Status
Chad Smith Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+345109@code.launchpad.net

Commit message

ds-identify: Remove dupe call to is_ds_enabled, improve debug message.

We had two calls to is_ds_enabled, and the debug message looked
something like this:
  is_ds_enabled returned 1: ConfigDrive NoCloud
Now instead we have just one call, and the debug message like:
  is_ds_enabled(IBMCloud) = true

Description of the change

see commit message

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:671f5219b69561b7ab76e90334f65ea429728d69
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1101/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:b99a948b0259e9974a8d9ac5ac2da71c3295ee5d
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1107/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)
Revision history for this message
Chad Smith (chad.smith) wrote :

Green to me.

review: Approve
Revision history for this message
Chad Smith (chad.smith) wrote :

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=bde30070

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

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 a062e4d..435a5bc 100755
3--- a/tools/ds-identify
4+++ b/tools/ds-identify
5@@ -641,9 +641,11 @@ check_configdrive_v2() {
6 return ${DS_FOUND}
7 fi
8
9- is_ds_enabled "IBMCloud"
10- debug 1 "is_ds_enabled returned $?: $DI_DSLIST"
11- is_ds_enabled "IBMCloud" && is_ibm_cloud && return ${DS_NOT_FOUND}
12+ local ibm_enabled=false
13+ is_ds_enabled "IBMCloud" && ibm_enabled=true
14+ debug 1 "is_ds_enabled(IBMCloud) = $ibm_enabled."
15+ [ "$ibm_enabled" = "true" ] && is_ibm_cloud && return ${DS_NOT_FOUND}
16+
17 if has_fs_with_label CONFIG-2 config-2; then
18 return ${DS_FOUND}
19 fi

Subscribers

People subscribed via source and target branches