diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-09 21:55:39 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-09-09 21:57:45 -0400 |
| commit | 8cf1212d4aa79959e46974bf1e3532af1ffe4b41 (patch) | |
| tree | 574e571f2291f27079b26876ab534cf3aa55e9ba /debian/cloud-init.templates | |
| parent | ea732e69516983b1d9838b0d80540a832594748a (diff) | |
| parent | 37527ac38c2829dba6d284f23ed40f007a7ee176 (diff) | |
| download | vyos-cloud-init-8cf1212d4aa79959e46974bf1e3532af1ffe4b41.tar.gz vyos-cloud-init-8cf1212d4aa79959e46974bf1e3532af1ffe4b41.zip | |
Merge branch 'ubuntu/devel' into ubuntu/xenial
- debian/cloud-init.templates fix capitalisation in template so
dpkg-reconfigure works to select OpenStack. (LP: #1575727)
- d/README.source, d/control, d/new-upstream-snapshot, d/rules: sync
with yakkety for changes due to move to git.
- d/rules: change PYVER=python3 to PYVER=3 to adjust to upstream change.
- debian/rules, debian/cloud-init.install: remove install file
to ensure expected files are collected into cloud-init deb.
(LP: #1615745)
- debian/dirs: remove obsolete / unused file.
LP: #1575727
LP: #1615745
Diffstat (limited to 'debian/cloud-init.templates')
| -rw-r--r-- | debian/cloud-init.templates | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/cloud-init.templates b/debian/cloud-init.templates index 30bf04a1..f056f05b 100644 --- a/debian/cloud-init.templates +++ b/debian/cloud-init.templates @@ -1,7 +1,7 @@ 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-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 Description: Which data sources should be searched? Cloud-init supports searching different "Data Sources" for information |