X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=xenial%2Fdebian%2Fceilometer-api.templates;h=c91046178a6b428a1e3dc3082570ea68911c6cba;hb=a765f3372c4577f478a2ea02b76ab41f52c4215c;hp=760c375ed2a4faa402b9da12c9a386b0d41808f3;hpb=c5ede780b72c319960af81d5de6a528ec53b5093;p=openstack-build%2Fceilometer-build.git

diff --git a/xenial/debian/ceilometer-api.templates b/xenial/debian/ceilometer-api.templates
index 760c375..c910461 100644
--- a/xenial/debian/ceilometer-api.templates
+++ b/xenial/debian/ceilometer-api.templates
@@ -1,31 +1,54 @@
+# 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: ceilometer/register-endpoint
 Type: boolean
 Default: false
-_Description: Register Ceilometer in the keystone endpoint catalog?
- Each Openstack services (each API) should be registered in order to be
+_Description: Register Ceilometer 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 a known admin project name, admin username and password. The
+ admin auth token is not used anymore.
 
 Template: ceilometer/keystone-ip
 Type: string
-_Description: Keystone IP address:
- Enter the IP address of your keystone server, so that ceilometer-api can
+_Description: Keystone server IP address:
+ Please enter the IP address of the Keystone server, so that ceilometer-api can
  contact Keystone to do the Ceilometer service and endpoint creation.
 
-Template: ceilometer/keystone-auth-token
+Template: ceilometer/keystone-admin-name
+Type: string
+Default: admin
+_Description: Keystone admin name:
+ To register the service endpoint, this package needs to know the Admin login,
+ name, project name, and password to the Keystone server.
+
+Template: ceilometer/keystone-project-name
+Type: string
+Default: admin
+_Description: Keystone admin project name:
+ To register the service endpoint, this package needs to know the Admin login,
+ name, project name, and password to the Keystone server.
+
+Template: ceilometer/keystone-admin-password
 Type: password
-_Description: Keystone Auth Token:
- To configure its endpoint in Keystone, ceilometer-api needs the Keystone auth
- token.
+_Description: Keystone admin password:
+ To register the service endpoint, this package needs to know the Admin login,
+ name, project name, and password to the Keystone server.
 
 Template: ceilometer/endpoint-ip
 Type: string
 _Description: Ceilometer endpoint IP address:
- Enter the IP address that will be used to contact Ceilometer (eg: the
- Ceilometer endpoint IP address).
+ Please enter the IP address that will be used to contact Ceilometer.
  .
  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
@@ -35,6 +58,6 @@ Template: ceilometer/region-name
 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.