[Openstack-devel] Bug#708748: [RFR] templates://heat/{heat-engine.templates, heat-api-cfn.templates, heat-api-cloudwatch.templates, heat-api.templates}

Christian PERRIER bubulle at debian.org
Sun Jun 2 16:35:54 UTC 2013


Please find, for review, the debconf templates and packages descriptions for the heat source package.

This review will last from Sunday, June 02, 2013 to Wednesday, June 12, 2013.

Please send reviews as unified diffs (diff -u) against the original
files. Comments about your proposed changes will be appreciated.

Your review should be sent as an answer to this mail.

When appropriate, I will send intermediate requests for review, with
"[RFRn]" (n>=2) as a subject tag.

When we will reach a consensus, I send a "Last Chance For
Comments" mail with "[LCFC]" as a subject tag.

Finally, a summary will be sent to the review bug report,
and a mail will be sent to this list with "[BTS]" as a subject tag.

Rationale:
--- heat.old/debian/heat-engine.templates	2013-05-18 13:40:45.925186402 +0300
+++ heat/debian/heat-engine.templates	2013-06-02 19:24:33.706659528 +0300
@@ -2,16 +2,16 @@
 Type: boolean 
 Default: true
 _Description: Set up a database for heat-engine?
- No database has been set up for heat-engine to use. Before continuing, you
- should make sure you have:
+ No database has been set up for heat-engine to use. Before
+ continuing, you should make sure you have the following information:
  .
-  - the server host name (that server must allow TCP connections from this
+  * the type of database that you want to use;
+  * the database server host name (that server must allow TCP connections from this
     machine);
-  - a username and password to access the database.
-  - A database type that you want to use.
+  * a username and password to access the database.
  .
- If some of these requirements are missing, reject this option and run with  
- regular sqlite support.
+ If some of these requirements are missing, do not choose this option and run with
+ regular SQLite support.
  .
- You can change this setting later on by running 'dpkg-reconfigure -plow  
- heat-engine'.
+ You can change this setting later on by running "dpkg-reconfigure -plow
+ heat-engine".
--- heat.old/debian/heat-api-cfn.templates	2013-05-18 13:40:45.921186296 +0300
+++ heat/debian/heat-api-cfn.templates	2013-06-02 19:24:33.706659528 +0300
@@ -2,8 +2,8 @@
 Type: string
 Default: 127.0.0.1
 _Description: Auth server hostname:
- Please specify the URL of your authentication server. Typically this is also
- the URL of your OpenStack Identity Service (Keystone).
+ Please specify the hostname of your authentication server. Typically this is also
+ the hostname of your OpenStack Identity Service (Keystone).
 
 Template: heat/admin-tenant-name
 Type: string
--- heat.old/debian/heat-api-cloudwatch.templates	2013-05-18 13:40:45.925186402 +0300
+++ heat/debian/heat-api-cloudwatch.templates	2013-06-02 19:24:33.706659528 +0300
@@ -1,20 +1,40 @@
 Template: heat/auth-host
 Type: string
 Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your authentication server. Typically
- this is also the URL of your OpenStack Identity Service (Keystone).
+_Description: Authentication server hostname:
+ Please specify the hostname of the authentication server. Typically
+ this is also the hostname of the OpenStack Identity Service (Keystone).
 
 Template: heat/admin-tenant-name
 Type: string
 Default: admin
-_Description: Auth server tenant name:
+_Description: Authentication server tenant name:
+ Please specify the authentication server tenant name.
 
 Template: heat/admin-user
 Type: string
 Default: admin
-_Description: Auth server username:
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
 
 Template: heat/admin-password
 Type: password
-_Description: Auth server password:
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.
+
+Template: heat/admin-tenant-name
+Type: string
+Default: admin
+_Description: Authentication server tenant name:
+ Please specify the authentication server tenant name.
+
+Template: heat/admin-user
+Type: string
+Default: admin
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
+
+Template: heat/admin-password
+Type: password
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.
--- heat.old/debian/heat-api.templates	2013-05-18 13:40:45.921186296 +0300
+++ heat/debian/heat-api.templates	2013-06-02 19:24:33.706659528 +0300
@@ -1,52 +1,54 @@
 Template: heat/auth-host
 Type: string
 Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your authentication server. Typically this is also
- the URL of your OpenStack Identity Service (Keystone).
+_Description: Authentication server hostname:
+ Please specify the hostname of the authentication server. Typically
+ this is also the hostname of the OpenStack Identity Service (Keystone).
 
 Template: heat/admin-tenant-name
 Type: string
 Default: admin
-_Description: Auth server tenant name:
+_Description: Authentication server tenant name:
+ Please specify the authentication server tenant name.
 
 Template: heat/admin-user
 Type: string
 Default: admin
-_Description: Auth server username:
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
 
 Template: heat/admin-password
 Type: password
-_Description: Auth server password:
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.
 
 Template: heat/register-endpoint
 Type: boolean
 Default: false
-_Description: Register Heat in the keystone endpoint catalog?
- Each Openstack services (each API) should be registered in order to be
+_Description: Register Heat in the Keystone endpoint catalog?
+ Each OpenStack service (each API) should be registered in order to be
  accessible. This is done using "keystone service-create" and "keystone
- endpoint-create". Select if you want to run these commands now.
+ endpoint-create". This can be done automatically now.
  .
- Note that you will need to have an up and running keystone server on which to
- connect using the Keystone auth token.
+ Note that you will need to have an up and running Keystone server on which to
+ connect using the Keystone authentication token.
 
 Template: heat/keystone-ip
 Type: string
-_Description: Keystone IP address:
- Enter the IP address of your keystone server, so that heat-api can
- contact Keystone to do the Heat service and endpoint creation.
+_Description: Keystone server IP address:
+ Please enter the IP address of the Keystone server, so that heat-api can
+ contact Keystone to do the Cinder service and endpoint creation.
 
 Template: heat/keystone-auth-token
 Type: password
-_Description: Keystone Auth Token:
- To configure its endpoint in Keystone, heat-api needs the Keystone auth
- token.
+_Description: Keystone authentication token:
+ To configure its endpoint in Keystone, cinder-api needs the Keystone
+ authentication token.
 
 Template: heat/endpoint-ip
 Type: string
 _Description: Heat endpoint IP address:
- Enter the IP address that will be used to contact Heat (eg: the Heat
- endpoint IP address).
+ Please enter the IP address that will be used to contact Heat.
  .
  This IP address should be accessible from the clients that will use this
  service, so if you are installing a public cloud, this should be a public
@@ -56,6 +58,6 @@
 Type: string
 Default: regionOne
 _Description: Name of the region to register:
- Openstack can be used using availability zones, with each region representing
+ OpenStack supports using availability zones, with each region representing
  a location. Please enter the zone that you wish to use when registering the
  endpoint.

-- 

-------------- next part --------------
Template: heat/configure_db
Type: boolean 
Default: true
_Description: Set up a database for heat-engine?
 No database has been set up for heat-engine to use. Before
 continuing, you should make sure you have the following information:
 .
  * the type of database that you want to use;
  * the database server host name (that server must allow TCP connections from this
    machine);
  * a username and password to access the database.
 .
 If some of these requirements are missing, do not choose this option and run with
 regular SQLite support.
 .
 You can change this setting later on by running "dpkg-reconfigure -plow
 heat-engine".
-------------- next part --------------
Template: heat/auth-host
Type: string
Default: 127.0.0.1
_Description: Auth server hostname:
 Please specify the hostname of your authentication server. Typically this is also
 the hostname of your OpenStack Identity Service (Keystone).

Template: heat/admin-tenant-name
Type: string
Default: admin
_Description: Auth server tenant name:

Template: heat/admin-user
Type: string
Default: admin
_Description: Auth server username:

Template: heat/admin-password
Type: password
_Description: Auth server password:
-------------- next part --------------
Template: heat/auth-host
Type: string
Default: 127.0.0.1
_Description: Authentication server hostname:
 Please specify the hostname of the authentication server. Typically
 this is also the hostname of the OpenStack Identity Service (Keystone).

Template: heat/admin-tenant-name
Type: string
Default: admin
_Description: Authentication server tenant name:
 Please specify the authentication server tenant name.

Template: heat/admin-user
Type: string
Default: admin
_Description: Authentication server username:
 Please specify the username to use with the authentication server.

Template: heat/admin-password
Type: password
_Description: Authentication server password:
 Please specify the password to use with the authentication server.

Template: heat/admin-tenant-name
Type: string
Default: admin
_Description: Authentication server tenant name:
 Please specify the authentication server tenant name.

Template: heat/admin-user
Type: string
Default: admin
_Description: Authentication server username:
 Please specify the username to use with the authentication server.

Template: heat/admin-password
Type: password
_Description: Authentication server password:
 Please specify the password to use with the authentication server.
-------------- next part --------------
Template: heat/auth-host
Type: string
Default: 127.0.0.1
_Description: Authentication server hostname:
 Please specify the hostname of the authentication server. Typically
 this is also the hostname of the OpenStack Identity Service (Keystone).

Template: heat/admin-tenant-name
Type: string
Default: admin
_Description: Authentication server tenant name:
 Please specify the authentication server tenant name.

Template: heat/admin-user
Type: string
Default: admin
_Description: Authentication server username:
 Please specify the username to use with the authentication server.

Template: heat/admin-password
Type: password
_Description: Authentication server password:
 Please specify the password to use with the authentication server.

Template: heat/register-endpoint
Type: boolean
Default: false
_Description: Register Heat in the Keystone endpoint catalog?
 Each OpenStack service (each API) should be registered in order to be
 accessible. This is done using "keystone service-create" and "keystone
 endpoint-create". This can be done automatically now.
 .
 Note that you will need to have an up and running Keystone server on which to
 connect using the Keystone authentication token.

Template: heat/keystone-ip
Type: string
_Description: Keystone server IP address:
 Please enter the IP address of the Keystone server, so that heat-api can
 contact Keystone to do the Heat service and endpoint creation.

Template: heat/keystone-auth-token
Type: password
_Description: Keystone authentication token:
 To configure its endpoint in Keystone, heat-api needs the Keystone
 authentication token.

Template: heat/endpoint-ip
Type: string
_Description: Heat endpoint IP address:
 Please enter the IP address that will be used to contact Heat.
 .
 This IP address should be accessible from the clients that will use this
 service, so if you are installing a public cloud, this should be a public
 IP address.

Template: heat/region-name
Type: string
Default: regionOne
_Description: Name of the region to register:
 OpenStack supports using availability zones, with each region representing
 a location. Please enter the zone that you wish to use when registering the
 endpoint.
-------------- next part --------------
--- heat.old/debian/heat-engine.templates	2013-05-18 13:40:45.925186402 +0300
+++ heat/debian/heat-engine.templates	2013-06-02 19:24:33.706659528 +0300
@@ -2,16 +2,16 @@
 Type: boolean 
 Default: true
 _Description: Set up a database for heat-engine?
- No database has been set up for heat-engine to use. Before continuing, you
- should make sure you have:
+ No database has been set up for heat-engine to use. Before
+ continuing, you should make sure you have the following information:
  .
-  - the server host name (that server must allow TCP connections from this
+  * the type of database that you want to use;
+  * the database server host name (that server must allow TCP connections from this
     machine);
-  - a username and password to access the database.
-  - A database type that you want to use.
+  * a username and password to access the database.
  .
- If some of these requirements are missing, reject this option and run with  
- regular sqlite support.
+ If some of these requirements are missing, do not choose this option and run with
+ regular SQLite support.
  .
- You can change this setting later on by running 'dpkg-reconfigure -plow  
- heat-engine'.
+ You can change this setting later on by running "dpkg-reconfigure -plow
+ heat-engine".
--- heat.old/debian/heat-api-cfn.templates	2013-05-18 13:40:45.921186296 +0300
+++ heat/debian/heat-api-cfn.templates	2013-06-02 19:24:33.706659528 +0300
@@ -2,8 +2,8 @@
 Type: string
 Default: 127.0.0.1
 _Description: Auth server hostname:
- Please specify the URL of your authentication server. Typically this is also
- the URL of your OpenStack Identity Service (Keystone).
+ Please specify the hostname of your authentication server. Typically this is also
+ the hostname of your OpenStack Identity Service (Keystone).
 
 Template: heat/admin-tenant-name
 Type: string
--- heat.old/debian/heat-api-cloudwatch.templates	2013-05-18 13:40:45.925186402 +0300
+++ heat/debian/heat-api-cloudwatch.templates	2013-06-02 19:24:33.706659528 +0300
@@ -1,20 +1,40 @@
 Template: heat/auth-host
 Type: string
 Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your authentication server. Typically
- this is also the URL of your OpenStack Identity Service (Keystone).
+_Description: Authentication server hostname:
+ Please specify the hostname of the authentication server. Typically
+ this is also the hostname of the OpenStack Identity Service (Keystone).
 
 Template: heat/admin-tenant-name
 Type: string
 Default: admin
-_Description: Auth server tenant name:
+_Description: Authentication server tenant name:
+ Please specify the authentication server tenant name.
 
 Template: heat/admin-user
 Type: string
 Default: admin
-_Description: Auth server username:
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
 
 Template: heat/admin-password
 Type: password
-_Description: Auth server password:
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.
+
+Template: heat/admin-tenant-name
+Type: string
+Default: admin
+_Description: Authentication server tenant name:
+ Please specify the authentication server tenant name.
+
+Template: heat/admin-user
+Type: string
+Default: admin
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
+
+Template: heat/admin-password
+Type: password
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.
--- heat.old/debian/heat-api.templates	2013-05-18 13:40:45.921186296 +0300
+++ heat/debian/heat-api.templates	2013-06-02 19:33:18.596515065 +0300
@@ -1,52 +1,54 @@
 Template: heat/auth-host
 Type: string
 Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your authentication server. Typically this is also
- the URL of your OpenStack Identity Service (Keystone).
+_Description: Authentication server hostname:
+ Please specify the hostname of the authentication server. Typically
+ this is also the hostname of the OpenStack Identity Service (Keystone).
 
 Template: heat/admin-tenant-name
 Type: string
 Default: admin
-_Description: Auth server tenant name:
+_Description: Authentication server tenant name:
+ Please specify the authentication server tenant name.
 
 Template: heat/admin-user
 Type: string
 Default: admin
-_Description: Auth server username:
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
 
 Template: heat/admin-password
 Type: password
-_Description: Auth server password:
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.
 
 Template: heat/register-endpoint
 Type: boolean
 Default: false
-_Description: Register Heat in the keystone endpoint catalog?
- Each Openstack services (each API) should be registered in order to be
+_Description: Register Heat in the Keystone endpoint catalog?
+ Each OpenStack service (each API) should be registered in order to be
  accessible. This is done using "keystone service-create" and "keystone
- endpoint-create". Select if you want to run these commands now.
+ endpoint-create". This can be done automatically now.
  .
- Note that you will need to have an up and running keystone server on which to
- connect using the Keystone auth token.
+ Note that you will need to have an up and running Keystone server on which to
+ connect using the Keystone authentication token.
 
 Template: heat/keystone-ip
 Type: string
-_Description: Keystone IP address:
- Enter the IP address of your keystone server, so that heat-api can
+_Description: Keystone server IP address:
+ Please enter the IP address of the Keystone server, so that heat-api can
  contact Keystone to do the Heat service and endpoint creation.
 
 Template: heat/keystone-auth-token
 Type: password
-_Description: Keystone Auth Token:
- To configure its endpoint in Keystone, heat-api needs the Keystone auth
- token.
+_Description: Keystone authentication token:
+ To configure its endpoint in Keystone, heat-api needs the Keystone
+ authentication token.
 
 Template: heat/endpoint-ip
 Type: string
 _Description: Heat endpoint IP address:
- Enter the IP address that will be used to contact Heat (eg: the Heat
- endpoint IP address).
+ Please enter the IP address that will be used to contact Heat.
  .
  This IP address should be accessible from the clients that will use this
  service, so if you are installing a public cloud, this should be a public
@@ -56,6 +58,6 @@
 Type: string
 Default: regionOne
 _Description: Name of the region to register:
- Openstack can be used using availability zones, with each region representing
+ OpenStack supports using availability zones, with each region representing
  a location. Please enter the zone that you wish to use when registering the
  endpoint.
--- heat.old/debian/changelog	2013-05-18 13:40:45.925186402 +0300
+++ heat/debian/changelog	2013-05-18 15:39:05.339805746 +0300
@@ -1,3 +1,11 @@
+heat (2013.1-3) UNRELEASED; urgency=low
+
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #708748
+  * [Debconf translation updates]
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 18 May 2013 14:39:04 +0200
+
 heat (2013.1-2) unstable; urgency=low
 
   * Uploading to unstable.
-------------- next part --------------
Source: heat
Section: web
Priority: optional
Maintainer: PKG OpenStack <openstack-devel at lists.alioth.debian.org>
Uploaders: Loic Dachary (OuoU) <loic at debian.org>,
           Julien Danjou <acid at debian.org>,
           Thomas Goirand <zigo at debian.org>,
           Ghe Rivero <ghe.rivero at stackops.com>,
           Mehdi Abaakouk <sileht at sileht.net>
Build-Depends: debhelper (>= 9),
 po-debconf,
 python-all (>= 2.6.6-3~),
 openstack-pkg-tools (>= 4)
Build-Depends-Indep: pep8 (>= 1.3.3),
 python-argparse,
 python-babel,
 python-boto,
 python-cinderclient,
 python-coverage,
 python-crypto,
 python-eventlet (>= 0.9.16),
 python-extras,
 python-glanceclient,
 python-greenlet (>= 0.3.1),
 python-httplib2,
 python-iso8601,
 python-keystoneclient,
 python-kombu,
 python-lxml (>= 2.3),
 python-memcache,
 python-migrate,
 python-mox,
 python-nose,
 python-nosexcover,
 python-novaclient,
 python-oslo.config,
 python-paste,
 python-pastedeploy,
 python-paramiko,
 python-pycryptopp,
 python-qpid,
 python-quantumclient,
 python-routes,
 python-sendfile,
 python-setuptools,
 python-sphinx,
 python-sqlalchemy (>= 0.7.8),
 python-swiftclient,
 python-webob,
 python-yaml
Standards-Version: 3.9.3
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/heat.git;a=summary
Vcs-Git: git://anonscm.debian.org/openstack/heat.git
Homepage: http://wiki.openstack.org/Heat

Package: python-heat
Section: python
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${python:Depends}, ${misc:Depends},
 python-argparse,
 python-boto,
 python-cinderclient,
 python-crypto,
 python-eventlet (>= 0.9.16),
 python-extras,
 python-glanceclient,
 python-greenlet (>= 0.3.1),
 python-httplib2,
 python-iso8601,
 python-keystoneclient,
 python-kombu,
 python-lxml (>= 2.3),
 python-memcache,
 python-migrate,
 python-novaclient,
 python-oslo.config,
 python-paste,
 python-pastedeploy,
 python-pycryptopp, 
 python-qpid,
 python-quantumclient,
 python-routes,  
 python-sendfile,  
 python-setuptools,
 python-sqlalchemy (>= 0.7.8),
 python-swiftclient,
 python-webob,
 python-yaml
Description: OpenStack orchestration service - Python files
 Heat is a service to orchestrate multiple composite cloud applications using
 templates, through both an OpenStack-native ReST API and a
 CloudFormation-compatible Query API.
 .
 This package contains the Python libraries.

Package: heat-common
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${python:Depends}, ${misc:Depends}, python-heat (=${binary:Version}),
 adduser
Description: OpenStack orchestration service - common files
 Heat is a service to orchestrate multiple composite cloud applications using
 templates, through both an OpenStack-native ReST API and a
 CloudFormation-compatible Query API.
 .
 This package contains the common files.

Package: heat-engine
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}),
 adduser
Description: OpenStack orchestration service - engine
 Heat is a service to orchestrate multiple composite cloud applications using
 templates, through both an OpenStack-native ReST API and a
 CloudFormation-compatible Query API.
 .
 This package contains the heat engine, which is the core service of heat, and
 which the API servers will use.

Package: heat-api
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}),
 adduser
Description: OpenStack orchestration service - ReST API
 Heat is a service to orchestrate multiple composite cloud applications using
 templates, through both an OpenStack-native ReST API and a
 CloudFormation-compatible Query API.
 .
 This package contains the ReST API.

Package: heat-api-cfn
Architecture: all   
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}),
 adduser
Description: OpenStack orchestration service - CFN API
 Heat is a service to orchestrate multiple composite cloud applications using
 templates, through both an OpenStack-native ReST API and a
 CloudFormation-compatible Query API.
 .
 This package contains the CloudFormation (CFN) API.

Package: heat-api-cloudwatch
Architecture: all    
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}),
 adduser
Description: OpenStack orchestration service - CloudWatch API
 Heat is a service to orchestrate multiple composite cloud applications using
 templates, through both an OpenStack-native ReST API and a
 CloudFormation-compatible Query API.
 .
 This package contains the CloudWatch API.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/openstack-devel/attachments/20130602/4f513880/attachment-0001.pgp>


More information about the Openstack-devel mailing list