[Python-apps-team] Bug#710444: [BTS#710444] templates://cloud-init/{cloud-init.templates} : Final update for English review

[Justin B Rye]

Justin B Rye wrote:
> Okay, I'm definitely still too unsure to offer a patch.

Still, just in case it helps... here's a patch with all those wild
guesses about the templates, plus one tweak to the control file:

- keys, install SSH public keys for logging in a default account, set up
+ keys, install SSH public keys for logging into a default account, set up

-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
-------------- next part --------------
diff -ru cloud-init-0.7.2.pristine/debian/cloud-init.templates cloud-init-0.7.2/debian/cloud-init.templates
--- cloud-init-0.7.2.pristine/debian/cloud-init.templates	2013-05-28 08:01:14.000000000 +0100
+++ cloud-init-0.7.2/debian/cloud-init.templates	2013-06-22 20:39:22.612422378 +0100
@@ -1,12 +1,12 @@
 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, AltCloud, CloudStack, ConfigDrive, Ec2, MAAS, OVF, None
+Choices-C: NoCloud, AltCloud, CloudStack, ConfigDrive, Ec2, MAAS, OVF, None
+__Choices: /var/lib/cloud/seed only, AltCloud Config Drive, CloudStack metadata service, OpenStack Config Drive, EC2 Metadata service, Ubuntu MAAS, OVF Transports, Failsafe datasource
+_Description: Data sources to read from:
  Cloud-init supports searching different "Data Sources" for information
  that it uses to configure a cloud instance.
  .
- Warning: Only select 'Ec2' if this system will be run on a system with
- the EC2 metadata service present.  Doing so incorrectly will result in
- a substantial timeout on boot.
+ Please note that "EC2 Metadata service" should be used only if
+ the EC2 metadata service is present. Otherwise, it will trigger
+ a very noticeable timeout on boot.
diff -ru cloud-init-0.7.2.pristine/debian/control cloud-init-0.7.2/debian/control
--- cloud-init-0.7.2.pristine/debian/control	2013-05-29 07:20:59.000000000 +0100
+++ cloud-init-0.7.2/debian/control	2013-06-22 20:36:24.297368108 +0100
@@ -40,14 +40,12 @@
          python-prettytable,
          python-requests,
          ${misc:Depends}
-Description: configuration and customization of cloud instances
- Framework and tool written in Python to handle early initialization of a
- cloud instance. Cloud-init can for example set a default locale and a host
- name, generate SSH private host keys, add SSH keys to a user's
- authorized_keys so they can log in, and set up ephemeral mount points.
+Description: initialization system for infrastructure cloud instances
+ Cloud-init provides a framework and tool to configure and customize virtual
+ machine instances for Infrastructure-as-a-Service (IaaS) clouds platforms. It
+ can for example set a default locale and hostname, generate SSH private host
+ keys, install SSH public keys for logging into a default account, set up
+ ephemeral mount points, and run user-provided scripts.
  .
- Cloud-init's behavior can be configured via user-data, given by the user at
- instance launch time.
- .
- See upstream project for more details:
- https://help.ubuntu.com/community/CloudInit
+ Various methods are supported for passing data to the instance at launch
+ time, including the standard interfaces of multiple platforms.
-------------- next part --------------
Template: cloud-init/datasources
Type: multiselect
Default: NoCloud, AltCloud, CloudStack, ConfigDrive, Ec2, MAAS, OVF, None
Choices-C: NoCloud, AltCloud, CloudStack, ConfigDrive, Ec2, MAAS, OVF, None
__Choices: /var/lib/cloud/seed only, AltCloud Config Drive, CloudStack metadata service, OpenStack Config Drive, EC2 Metadata service, Ubuntu MAAS, OVF Transports, Failsafe datasource
_Description: Data sources to read from:
 Cloud-init supports searching different "Data Sources" for information
 that it uses to configure a cloud instance.
 .
 Please note that "EC2 Metadata service" should be used only if
 the EC2 metadata service is present. Otherwise, it will trigger
 a very noticeable timeout on boot.
-------------- next part --------------
Source: cloud-init
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: Charles Plessy <plessy at debian.org>,
           Miguel Landaeta <miguel at miguel.cc>,
           Julien Danjou <acid at debian.org>,
           Thomas Goirand <zigo at debian.org>
Section: admin
Priority: optional
Build-Depends: debhelper (>= 9),
               po-debconf,
               pyflakes,
               pylint,
               python,
               python-nose,
               python-mocker,
               python-configobj,
               python-oauth,
               python-boto (>= 2.3),
               python-cheetah,
               python-setuptools,
               python-yaml
Standards-Version: 3.9.3
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/cloud-init/trunk/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/cloud-init/trunk/
Homepage: https://launchpad.net/cloud-init

Package: cloud-init
Architecture: all
Depends: lsb-base,
         ifupdown,
         procps,
         python,
         python (>= 2.7) | python-argparse,
         python-cheetah,
         python-configobj,
         python-oauth,
         python-software-properties,
         python-yaml,
         python-boto (>= 2.3),
         python-prettytable,
         python-requests,
         ${misc:Depends}
Description: initialization system for infrastructure cloud instances
 Cloud-init provides a framework and tool to configure and customize virtual
 machine instances for Infrastructure-as-a-Service (IaaS) clouds platforms. It
 can for example set a default locale and hostname, generate SSH private host
 keys, install SSH public keys for logging into a default account, set up
 ephemeral mount points, and run user-provided scripts.
 .
 Various methods are supported for passing data to the instance at launch
 time, including the standard interfaces of multiple platforms.