cloud-init

Merge ~smoser/cloud-init:ubuntu/devel-fix-enable-ibmcloud into cloud-init:ubuntu/devel

  1. Git
  2. lp:~smoser/cloud-init
  3. ubuntu/devel-fix-enable-ibmcloud
  4. Merge into ubuntu/devel
Proposed by Scott Moser
Status: Merged
Approved by: Chad Smith
Approved revision: bdb3bcf536e268214b30ca998f92fe432111dc64
Merged at revision: 8fc628121353758313ac5afdb39e9c56bb7bdfd8
Proposed branch: ~smoser/cloud-init:ubuntu/devel-fix-enable-ibmcloud
Merge into: cloud-init:ubuntu/devel
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/cloud-init.templates (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Philip Roche (community) Approve
Chad Smith Approve
Scott Moser Pending
Review via email: mp+342940@code.launchpad.net

Commit message

update changelog

Description of the change

debian/cloud-init.templates: enable IBMCloud by default.

A previous commit to enable IBM cloud accidently did not add it
to the default list. That meant that images would not have IBMCloud
enabled by default (though dpkg-reconfigure could select it).

This just adds it to the default.

LP: #1762773

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

+1 on landing this

review: Approve
Revision history for this message
Philip Roche (philroche) wrote :

+1

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 091d59e..2594b37 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+cloud-init (18.2-4-g05926e48-0ubuntu2) UNRELEASED; urgency=medium
7+
8+ * debian/cloud-init.templates: enable IBMCloud by default (LP: #1762773).
9+
10+ -- Scott Moser <smoser@ubuntu.com> Tue, 10 Apr 2018 11:38:46 -0400
11+
12 cloud-init (18.2-4-g05926e48-0ubuntu1) bionic; urgency=medium
13
14 * New upstream snapshot.
15diff --git a/debian/cloud-init.templates b/debian/cloud-init.templates
16index ae2ca93..ef3c3a7 100644
17--- a/debian/cloud-init.templates
18+++ b/debian/cloud-init.templates
19@@ -1,6 +1,6 @@
20 Template: cloud-init/datasources
21 Type: multiselect
22-Default: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, Hetzner, None
23+Default: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, Hetzner, IBMCloud, None
24 Choices-C: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Bigstep, Scaleway, AliYun, Ec2, CloudStack, Hetzner, IBMCloud, None
25 Choices: NoCloud: Reads info from /var/lib/cloud/seed only, ConfigDrive: Reads data from Openstack Config Drive, OpenNebula: read from OpenNebula context disk, DigitalOcean: reads data from Droplet datasource, Azure: read from MS Azure cdrom. Requires walinux-agent, AltCloud: config disks for RHEVm and vSphere, OVF: Reads data from OVF Transports, MAAS: Reads data from Ubuntu MAAS, GCE: google compute metadata service, OpenStack: native openstack metadata service, CloudSigma: metadata over serial for cloudsigma.com, SmartOS: Read from SmartOS metadata service, Bigstep: Bigstep metadata service, Scaleway: Scaleway metadata service, AliYun: Alibaba metadata service, Ec2: reads data from EC2 Metadata service, CloudStack: Read from CloudStack metadata service, Hetzner: Hetzner Cloud, IBMCloud: IBM Cloud. Previously softlayer or bluemix., None: Failsafe datasource
26 Description: Which data sources should be searched?

Subscribers

People subscribed via source and target branches