Merge ~utlemming/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel

[Ben Howard]

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.

[Scott Moser (smoser)]

Generally speaking, we want commit messages on the merge proposal in "git style"
   subject
   <blank line>
   details

[Scott Moser (smoser)]

Pretty sure that you need to add a entry to 'Choices' as well as 'Choices-C'.
Please test and dpkg-reconfigure cloud-init to verify functional.

Also, I went ahead and added DigitalOcean to the deafult datasource list in settings.py in cloud-init.

61a7777... by Ben Howard on 2016-10-18

Merge remote-tracking branch 'upstream/ubuntu/devel' into ubuntu/devel

1112741... by Ben Howard on 2016-10-18

debian/cloud-init.templates: enabled DigitalOcean by default

Added DigitalOcean to the default templates as enabled by default.
This allows cloud-init to work out of the box on DigitalOcean droplets.

diff --git a/debian/cloud-init.templates b/debian/cloud-init.templates
index f056f05..494c27a 100644
--- a/debian/cloud-init.templates
+++ b/debian/cloud-init.templates
@@ -1,8 +1,8 @@
 Template: cloud-init/datasources
 Type: multiselect
-Default: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Ec2, CloudStack, None
-Choices-C: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Ec2, CloudStack, None
-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
+Default: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Ec2, CloudStack, None
+Choices-C: NoCloud, ConfigDrive, OpenNebula, DigitalOcean, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, SmartOS, Ec2, CloudStack, None
+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
 Description: Which data sources should be searched?
  Cloud-init supports searching different "Data Sources" for information
  that it uses to configure a cloud instance.