cloud-init

Merge ~darkmuggle-deactivatedaccount/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel

  1. Git
  2. lp:~darkmuggle-deactivatedaccount/cloud-init
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Ben Howard
Status: Merged
Merge reported by: Scott Moser
Merged at revision: not available
Proposed branch: ~darkmuggle-deactivatedaccount/cloud-init:ubuntu/devel
Merge into: cloud-init:ubuntu/devel
Diff against target: 16 lines (+3/-3)
1 file modified
debian/cloud-init.templates (+3/-3)
Reviewer Review Type Date Requested Status
Scott Moser Pending
Review via email: mp+307390@code.launchpad.net

Description of the change

Enabled DigitalOcean datasource by default. This change is entirely safe as the DigitalOcean datasource used dmi data to identify if its on DigitalOcean. I put it be before Azure as it it does not have an dependencies other than checking DMI data.

To post a comment you must log in.

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/debian/cloud-init.templates b/debian/cloud-init.templates
2index f056f05..494c27a 100644
3--- a/debian/cloud-init.templates
4+++ b/debian/cloud-init.templates
5@@ -1,8 +1,8 @@
6 Template: cloud-init/datasources
7 Type: multiselect
8-Default: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Ec2, CloudStack, None
9-Choices-C: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Ec2, CloudStack, None
10-Choices: NoCloud: Reads info from /var/lib/cloud/seed only, ConfigDrive: Reads data from Openstack Config Drive, OpenNebula: read from OpenNebula context disk, 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, Ec2: reads data from EC2 Metadata service, CloudStack: Read from CloudStack metadata service, None: Failsafe datasource
11+Default: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Ec2, CloudStack, None
12+Choices-C: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Ec2, CloudStack, None
13+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, Ec2: reads data from EC2 Metadata service, CloudStack: Read from CloudStack metadata service, None: Failsafe datasource
14 Description: Which data sources should be searched?
15 Cloud-init supports searching different "Data Sources" for information
16 that it uses to configure a cloud instance.

Subscribers

People subscribed via source and target branches