[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[RFR] templates://glance/{glance-common.templates,glance-api.templates}



Please find, for review, the debconf templates for the glance 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:
--- glance.old/debian/glance-common.templates	2013-05-17 11:01:07.505685886 +0300
+++ glance/debian/glance-common.templates	2013-05-24 12:03:35.114941268 +0300
@@ -9,10 +9,11 @@
 
 Template: glance/paste-flavor
 Type: select
-Choices: keystone, caching, keystone+caching, cachemanagement, keystone+cachemanagement
+__Choices: keystone, caching, keystone+caching, cachemanagement, keystone+cachemanagement
+Choices-C: keystone, caching, keystone+caching, cachemanagement, keystone+cachemanagement
 Default: caching
 _Description: Pipeline flavor:
- Please specify the flavor of pipeline to be used by Glance.
+ Please specify the flavor of the pipeline to be used by Glance.
  .
  If you use the OpenStack Identity Service (Keystone), you might want to
  select "keystone". If you don't use this service, you can safely choose

I think we should leave some room to translate the Choices. The
proposed way allows one doing that.

@@ -21,38 +22,41 @@
 Template: glance/auth-host
 Type: string
 Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your Glance 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 for Glance. Typically
+ this is also the hostname of the OpenStack Identity Service (Keystone).

Same changes than those we made for other packages.

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

Ditto

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

Ditto
 
 Template: glance/admin-password
 Type: password
-_Description: Auth server password:
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.

Ditto
 
 Template: glance/configure_db
 Type: boolean
 Default: true
-_Description: Set up a database for glance?
+_Description: Set up a database for Glance?
  No database has been set up for glance-registry or glance-api to use. Before
- continuing, you should make sure you have:
+ 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 user name 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
- glance-common'.
+ You can change this setting later on by running "dpkg-reconfigure -plow
+ glance-common".


Ditto

--- glance.old/debian/glance-api.templates	2013-05-17 11:01:07.505685886 +0300
+++ glance/debian/glance-api.templates	2013-05-24 11:16:10.391675702 +0300
@@ -1,31 +1,30 @@
 Template: glance/register-endpoint
 Type: boolean
 Default: false
-_Description: Register Glance in the keystone endpoint catalog?
- Each Openstack services (each API) should be registered in order to be
+_Description: Register Glance 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.

Ditto. Maybe "up-and-running"?
 
 Template: glance/keystone-ip
 Type: string
-_Description: Keystone IP address:
- Enter the IP address of your keystone server, so that glance-api can
+_Description: Keystone server IP address:
+ Please enter the IP address of the Keystone server, so that glance-api can
  contact Keystone to do the Glance service and endpoint creation.

Same changes than other packages

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

Same changes than other packages

 
 Template: glance/endpoint-ip
 Type: string
 _Description: Glance endpoint IP address:
- Enter the IP address that will be used to contact Glance (eg: the Glance
- endpoint IP address).
+ Please enter the IP address that will be used to contact Glance.
  .
  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

Same changes than other packages


-- 


# These templates have been reviewed by the debian-l10n-english
# team
#
# If modifications/additions/rewording are needed, please ask
# debian-l10n-english@lists.debian.org for advice.
#
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.

Template: glance/paste-flavor
Type: select
__Choices: keystone, caching, keystone+caching, cachemanagement, keystone+cachemanagement
Choices-C: keystone, caching, keystone+caching, cachemanagement, keystone+cachemanagement
Default: caching
_Description: Pipeline flavor:
 Please specify the flavor of the pipeline to be used by Glance.
 .
 If you use the OpenStack Identity Service (Keystone), you might want to
 select "keystone". If you don't use this service, you can safely choose
 "caching" only.

Template: glance/auth-host
Type: string
Default: 127.0.0.1
_Description: Authentication server hostname:
 Please specify the hostname of the authentication server for Glance. Typically
 this is also the hostname of the OpenStack Identity Service (Keystone).

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

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

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

Template: glance/configure_db
Type: boolean
Default: true
_Description: Set up a database for Glance?
 No database has been set up for glance-registry or glance-api 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 user name 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
 glance-common".
Template: glance/register-endpoint
Type: boolean
Default: false
_Description: Register Glance 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: glance/keystone-ip
Type: string
_Description: Keystone server IP address:
 Please enter the IP address of the Keystone server, so that glance-api can
 contact Keystone to do the Glance service and endpoint creation.

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

Template: glance/endpoint-ip
Type: string
_Description: Glance endpoint IP address:
 Please enter the IP address that will be used to contact Glance.
 .
 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: glance/region-name
Type: string
Default: regionOne
_Description: Name of the region to register:
 Openstack can be used using availability zones, with each region representing
 a location. Please enter the zone that you wish to use when registering the
 endpoint.
--- glance.old/debian/glance-common.templates	2013-05-17 11:01:07.505685886 +0300
+++ glance/debian/glance-common.templates	2013-05-24 12:03:35.114941268 +0300
@@ -9,10 +9,11 @@
 
 Template: glance/paste-flavor
 Type: select
-Choices: keystone, caching, keystone+caching, cachemanagement, keystone+cachemanagement
+__Choices: keystone, caching, keystone+caching, cachemanagement, keystone+cachemanagement
+Choices-C: keystone, caching, keystone+caching, cachemanagement, keystone+cachemanagement
 Default: caching
 _Description: Pipeline flavor:
- Please specify the flavor of pipeline to be used by Glance.
+ Please specify the flavor of the pipeline to be used by Glance.
  .
  If you use the OpenStack Identity Service (Keystone), you might want to
  select "keystone". If you don't use this service, you can safely choose
@@ -21,38 +22,41 @@
 Template: glance/auth-host
 Type: string
 Default: 127.0.0.1
-_Description: Auth server hostname:
- Please specify the URL of your Glance 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 for Glance. Typically
+ this is also the hostname of the OpenStack Identity Service (Keystone).
 
 Template: glance/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: glance/admin-user
 Type: string
 Default: admin
-_Description: Auth server username:
+_Description: Authentication server user name:
+ Please specify the username to use with the authentication server.
 
 Template: glance/admin-password
 Type: password
-_Description: Auth server password:
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.
 
 Template: glance/configure_db
 Type: boolean
 Default: true
-_Description: Set up a database for glance?
+_Description: Set up a database for Glance?
  No database has been set up for glance-registry or glance-api to use. Before
- continuing, you should make sure you have:
+ 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 user name 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
- glance-common'.
+ You can change this setting later on by running "dpkg-reconfigure -plow
+ glance-common".
--- glance.old/debian/glance-api.templates	2013-05-17 11:01:07.505685886 +0300
+++ glance/debian/glance-api.templates	2013-05-24 11:16:10.391675702 +0300
@@ -1,31 +1,30 @@
 Template: glance/register-endpoint
 Type: boolean
 Default: false
-_Description: Register Glance in the keystone endpoint catalog?
- Each Openstack services (each API) should be registered in order to be
+_Description: Register Glance 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: glance/keystone-ip
 Type: string
-_Description: Keystone IP address:
- Enter the IP address of your keystone server, so that glance-api can
+_Description: Keystone server IP address:
+ Please enter the IP address of the Keystone server, so that glance-api can
  contact Keystone to do the Glance service and endpoint creation.
 
 Template: glance/keystone-auth-token
 Type: password
-_Description: Keystone Auth Token:
- To configure its endpoint in Keystone, glance-api needs the Keystone auth
- token.
+_Description: Keystone authentication token:
+ To configure its endpoint in Keystone, glance-api needs the Keystone
+ authentication token.
 
 Template: glance/endpoint-ip
 Type: string
 _Description: Glance endpoint IP address:
- Enter the IP address that will be used to contact Glance (eg: the Glance
- endpoint IP address).
+ Please enter the IP address that will be used to contact Glance.
  .
  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
Source: glance
Section: net
Priority: extra
Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
Uploaders: Julien Danjou <acid@debian.org>,
           Thomas Goirand <zigo@debian.org>,
           Ghe Rivero <ghe.rivero@stackops.com>,
           Mehdi Abaakouk <sileht@sileht.net>
Build-Depends: debhelper (>= 9),
 po-debconf,
 python-all (>= 2.6.6-3~),
 openstack-pkg-tools,
 sqlite3
Build-Depends-Indep:
 curl,
 pep8 (>= 1.3.3),
 python-anyjson,
 python-argparse,
 python-babel,
 python-boto,
 python-coverage,
 python-crypto,
 python-dateutil,
 python-eventlet,
 python-fixtures,
 python-glanceclient,
 python-greenlet,
 python-httplib2 (>= 0.6.0),
 python-iso8601,
 python-jsonschema,
 python-keystoneclient (>= 1:0.2),
 python-kombu,
 python-lxml,
 python-migrate,
 python-mox,
 python-nose,
 python-oslo.config,
 python-passlib,
 python-paste,
 python-pastedeploy,
 python-requests,
 python-routes,
 python-sendfile,
 python-setuptools,
 python-sphinx (>= 1.1.2),
 python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
 python-swiftclient (>= 1:1.2),
 python-testtools (>=0.9.22),
 python-tox,
 python-webob,
 python-xattr,
 procps
Standards-Version: 3.9.4
Homepage: http://glance.openstack.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/glance.git;a=summary
Vcs-Git: git://anonscm.debian.org/openstack/glance.git

Package: python-glance
Architecture: all
Section: python
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${python:Depends}, ${misc:Depends},
 libxml2-dev,
 libxslt-dev,
 python-anyjson,
 python-argparse,
 python-boto,
 python-configobj,
 python-crypto,
 python-dateutil,
 python-eventlet,
 python-greenlet,
 python-httplib2 (>= 0.6.0),
 python-iso8601,
 python-jsonschema,
 python-keystoneclient (>= 1:0.2),
 python-kombu,
 python-lxml,
 python-migrate,
 python-oslo.config,
 python-passlib,
 python-pastedeploy,
 python-requests,
 python-routes,
 python-setuptools,
 python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
 python-swiftclient (>= 1:1.2),
 python-webob,
 python-xattr,
 procps
Provides: ${python:Provides}
Description: OpenStack Image Service - Python client library
 The Glance project provides services for discovering, registering, and
 retrieving virtual machine images over the cloud. They may be stand-alone
 services, or may be used to deliver images from object stores, such as
 OpenStack's Swift service, to Nova's compute nodes.
 .
 This package contains the Python libraries.

Package: glance
Architecture: all
Section: python
Pre-Depends: dpkg (>= 1.15.6~)
Depends:
 glance-api (= ${source:Version}),
 glance-registry (= ${source:Version}),
 ${misc:Depends},
 ${python:Depends}
Suggests: python-ceph
Description: OpenStack Image Service - metapackage
 The Glance project provides services for discovering, registering, and
 retrieving virtual machine images over the cloud. They may be stand-alone
 services, or may be used to deliver images from object stores, such as
 OpenStack's Swift service, to Nova's compute nodes.
 .
 This is a dependency package to install all of the Glance suite.

Package: python-glance-doc
Architecture: all
Section: doc
Pre-Depends: dpkg (>= 1.15.6~)
Depends: libjs-jquery, libjs-underscore, ${misc:Depends}
Description: OpenStack Image Service - Python library documentation
 The Glance project provides services for discovering, registering, and
 retrieving virtual machine images over the cloud. They may be stand-alone
 services, or may be used to deliver images from object stores, such as
 OpenStack's Swift service, to Nova's compute nodes.
 .
 This package contains the documentation.

Package: glance-common
Architecture: all
Section: python
Breaks: glance (<< 2012.1~e2-3)
Replaces: glance (<< 2012.1~e2-3)
Pre-Depends: dpkg (>= 1.15.6~)
Depends:
 adduser,
 debconf,
 python-glance (= ${source:Version}),
 python-glanceclient,
 ${misc:Depends},
 ${python:Depends},
Description: OpenStack Image Service - common files
 The Glance project provides services for discovering, registering, and
 retrieving virtual machine images over the cloud. They may be stand-alone
 services, or may be used to deliver images from object stores, such as
 OpenStack's Swift service, to Nova's compute nodes.
 .
 This package contains common files for Glance.

Package: glance-api
Architecture: all
Section: python
Pre-Depends: adduser, dpkg (>= 1.15.6~)
Depends: ${ostack-lsb-base}, debconf, ${python:Depends}, ${misc:Depends},
 glance-common (= ${source:Version}),
 python-keystoneclient
Description: OpenStack Image Service - API server
 The Glance project provides services for discovering, registering, and
 retrieving virtual machine images over the cloud. They may be stand-alone
 services, or may be used to deliver images from object stores, such as
 OpenStack's Swift service, to Nova's compute nodes.
 .
 This package contains the Glance API server.

Package: glance-registry
Architecture: all
Section: python
Pre-Depends: dpkg (>= 1.15.6~)
Depends: adduser, ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends},
 glance-common (= ${source:Version}),
 dbconfig-common
Description: OpenStack Image Service - registry server
 The Glance project provides services for discovering, registering, and
 retrieving virtual machine images over the cloud. They may be stand-alone
 services, or may be used to deliver images from object stores, such as
 OpenStack's Swift service, to Nova's compute nodes.
 .
 This package contains the Glance registry server.

Attachment: signature.asc
Description: Digital signature


Reply to: