cloud-init-dev team mailing list archive
-
cloud-init-dev team
-
Mailing list archive
-
Message #04477
[Merge] ~chad.smith/cloud-init:fix/add-ibmcloud-to-settings into cloud-init:master
Chad Smith has proposed merging ~chad.smith/cloud-init:fix/add-ibmcloud-to-settings into cloud-init:master.
Requested reviews:
cloud-init commiters (cloud-init-dev)
For more details, see:
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/342019
Add unit tests for Scott's branch updating settings.
--
Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:fix/add-ibmcloud-to-settings into cloud-init:master.
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
index 5fe749d..dde5749 100644
--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
@@ -37,6 +37,7 @@ CFG_BUILTIN = {
'Bigstep',
'Scaleway',
'Hetzner',
+ 'IBMCloud',
# At the end to act as a 'catch' when none of the above work...
'None',
],
diff --git a/tests/unittests/test_datasource/test_common.py b/tests/unittests/test_datasource/test_common.py
index 6d2dc5b..ec33388 100644
--- a/tests/unittests/test_datasource/test_common.py
+++ b/tests/unittests/test_datasource/test_common.py
@@ -15,6 +15,7 @@ from cloudinit.sources import (
DataSourceEc2 as Ec2,
DataSourceGCE as GCE,
DataSourceHetzner as Hetzner,
+ DataSourceIBMCloud as IBMCloud,
DataSourceMAAS as MAAS,
DataSourceNoCloud as NoCloud,
DataSourceOpenNebula as OpenNebula,
@@ -33,6 +34,7 @@ DEFAULT_LOCAL = [
ConfigDrive.DataSourceConfigDrive,
DigitalOcean.DataSourceDigitalOcean,
Hetzner.DataSourceHetzner,
+ IBMCloud.DataSourceIBMCloud,
NoCloud.DataSourceNoCloud,
OpenNebula.DataSourceOpenNebula,
OVF.DataSourceOVF,
Follow ups