diff options
| author | Scott Moser <smoser@brickies.net> | 2017-01-10 11:25:29 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-01-10 11:25:29 -0500 |
| commit | 9d2dfea8eeeb058ea0bd421cc8e382b056de6185 (patch) | |
| tree | 2127ae2ea8b2a6aefa1d8ad39ecf5192a98a6286 | |
| parent | 706233c75f8e2185b0e5afde809861337f72100f (diff) | |
| download | cloud-init-git-ubuntu/0.7.5-0ubuntu1.9.tar.gz | |
Import version 0.7.5-0ubuntu1.9ubuntu/0.7.5-0ubuntu1.9
Imported using git-import-dsc
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/cloud-init.templates | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index ed1dd5df..8e5193a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cloud-init (0.7.5-0ubuntu1.9) trusty; urgency=medium + + * d/cloud-init.templates: Include SmartOS data source in the default list + and choices (LP: #1398997). + + -- Daniel Watkins <daniel.watkins@canonical.com> Mon, 20 Apr 2015 14:21:13 +0100 + cloud-init (0.7.5-0ubuntu1.8) trusty; urgency=medium * debian/patches/lp-1411582-azure-udev-ephemeral-disks.patch: diff --git a/debian/cloud-init.templates b/debian/cloud-init.templates index 1076649c..25f82e5b 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, Ec2, CloudStack, None -Choices-C: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, Openstack, CloudSigma, 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, Ec2: reads data from EC2 Metadata service, CloudStack: Read from CloudStack metadata service, None: Failsafe datasource +Default: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, Ec2, CloudStack, SmartOS, None +Choices-C: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, Openstack, CloudSigma, Ec2, CloudStack, SmartOS, 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, Ec2: reads data from EC2 Metadata service, CloudStack: Read from CloudStack metadata service, SmartOS: Read from SmartOS 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. |