[Python-apps-commits] r9740 - in packages/cloud-init/trunk/debian (cloud-init.templates)

[plessy at users.alioth.debian.org]

    Date: Monday, June 10, 2013 @ 22:05:57
  Author: plessy
Revision: 9740

Synchronise from Ubuntu's package 0.7.2-0ubuntu1.

Modified:
  packages/cloud-init/trunk/debian/cloud-init.templates

Modified: packages/cloud-init/trunk/debian/cloud-init.templates
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.templates	2013-06-10 21:53:19 UTC (rev 9739)
+++ packages/cloud-init/trunk/debian/cloud-init.templates	2013-06-10 22:05:57 UTC (rev 9740)
@@ -1,9 +1,9 @@
 Template: cloud-init/datasources
 Type: multiselect
-Default: NoCloud, ConfigDrive, OVF, MAAS
-Choices-C: NoCloud, ConfigDrive, OVF, MAAS, Ec2
-Choices: NoCloud: Reads info from /var/lib/cloud/seed only, ConfigDrive: Reads data from Openstack Config Drive, OVF: Reads data from OVF Transports, MAAS: Reads data from Ubuntu MAAS, Ec2: reads data from EC2 Metadata service
-_Description: Which data sources should be searched?
+Default: NoCloud, ConfigDrive, AltCloud, OVF, MAAS, Ec2, CloudStack, None
+Choices-C: NoCloud, ConfigDrive, AltCloud, OVF, MAAS, Ec2, CloudStack, None
+Choices: NoCloud: Reads info from /var/lib/cloud/seed only, ConfigDrive: Reads data from Openstack Config Drive, AltCloud: config disks for RHEVm and vSphere, OVF: Reads data from OVF Transports, MAAS: Reads data from Ubuntu MAAS, 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.
  .