cloud-init

Merge ~chad.smith/cloud-init:fix/add-ibmcloud-to-settings into cloud-init:master

  1. Git
  2. lp:~chad.smith/cloud-init
  3. fix/add-ibmcloud-to-settings
  4. Merge into master
Proposed by Chad Smith
Status: Merged
Approved by: Chad Smith
Approved revision: d7a4502c712351a15315d631661075e416dedcb7
Merge reported by: Chad Smith
Merged at revision: bdeec31dca5d9a8dc98ae31fc20a29557a2ec59e
Proposed branch: ~chad.smith/cloud-init:fix/add-ibmcloud-to-settings
Merge into: cloud-init:master
Diff against target: 32 lines (+3/-0)
2 files modified
cloudinit/settings.py (+1/-0)
tests/unittests/test_datasource/test_common.py (+2/-0)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chad Smith Approve
Review via email: mp+342019@code.launchpad.net

Commit message

Enable IBMCloud datasource in settings.py.

This just got missed in the IBMCloud datasource addition.
Add it to the builtin list of datasources.

Description of the change

See commit message:
Added unit test fix for Scott's branch updating settings.

To post a comment you must log in.
Revision history for this message
Chad Smith (chad.smith) wrote :

Because I only fixed a unit test for inclusion of our new IBMCloud local datasource

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

PASSED: Continuous integration, rev:d7a4502c712351a15315d631661075e416dedcb7
https://jenkins.ubuntu.com/server/job/cloud-init-ci/926/
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/926/rebuild

review: Approve (continuous-integration)
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=bdeec31d

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/settings.py b/cloudinit/settings.py
2index 5fe749d..dde5749 100644
3--- a/cloudinit/settings.py
4+++ b/cloudinit/settings.py
5@@ -37,6 +37,7 @@ CFG_BUILTIN = {
6 'Bigstep',
7 'Scaleway',
8 'Hetzner',
9+ 'IBMCloud',
10 # At the end to act as a 'catch' when none of the above work...
11 'None',
12 ],
13diff --git a/tests/unittests/test_datasource/test_common.py b/tests/unittests/test_datasource/test_common.py
14index 6d2dc5b..ec33388 100644
15--- a/tests/unittests/test_datasource/test_common.py
16+++ b/tests/unittests/test_datasource/test_common.py
17@@ -15,6 +15,7 @@ from cloudinit.sources import (
18 DataSourceEc2 as Ec2,
19 DataSourceGCE as GCE,
20 DataSourceHetzner as Hetzner,
21+ DataSourceIBMCloud as IBMCloud,
22 DataSourceMAAS as MAAS,
23 DataSourceNoCloud as NoCloud,
24 DataSourceOpenNebula as OpenNebula,
25@@ -33,6 +34,7 @@ DEFAULT_LOCAL = [
26 ConfigDrive.DataSourceConfigDrive,
27 DigitalOcean.DataSourceDigitalOcean,
28 Hetzner.DataSourceHetzner,
29+ IBMCloud.DataSourceIBMCloud,
30 NoCloud.DataSourceNoCloud,
31 OpenNebula.DataSourceOpenNebula,
32 OVF.DataSourceOVF,

Subscribers

People subscribed via source and target branches