X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=xenial%2Fdebian%2Fceilometer-common.templates;h=66bd1b3e318c275c89ef63e7523d0dbf050e749c;hb=71ca0e6d2e27133b96e59b7047b7119b881b735d;hp=6bfef28d03975d076756cc3eb4b08d7c079c3c92;hpb=f341ed3e7040434b8dac823df8afa5e43fe97c31;p=openstack-build%2Fceilometer-build.git

diff --git a/xenial/debian/ceilometer-common.templates b/xenial/debian/ceilometer-common.templates
index 6bfef28..66bd1b3 100644
--- a/xenial/debian/ceilometer-common.templates
+++ b/xenial/debian/ceilometer-common.templates
@@ -7,7 +7,7 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: ceilometer/rabbit-host
+Template: ceilometer/rabbit_host
 Type: string
 Default: localhost
 _Description: IP address of your RabbitMQ host:
@@ -16,7 +16,7 @@ _Description: IP address of your RabbitMQ host:
  .
  Please specify the IP address of that server.
 
-Template: ceilometer/rabbit-userid
+Template: ceilometer/rabbit_userid
 Type: string
 Default: guest
 _Description: Username for connection to the RabbitMQ server:
@@ -25,10 +25,42 @@ _Description: Username for connection to the RabbitMQ server:
  .
  Please specify the username used to connect to the RabbitMQ server.
 
-Template: ceilometer/rabbit-password
+Template: ceilometer/rabbit_password
 Type: password
 _Description: Password for connection to the RabbitMQ server:
  In order to interoperate with other components of OpenStack, this package
  needs to connect to a central RabbitMQ server.
  .
  Please specify the password used to connect to the RabbitMQ server.
+
+Template: ceilometer/auth-host
+Type: string
+Default: 127.0.0.1
+_Description: Authentication server hostname:
+ Please specify the hostname of the authentication server for Ceilometer.
+ Typically this is also the hostname of the OpenStack Identity Service
+ (Keystone).
+
+Template: ceilometer/admin-tenant-name
+Type: string
+Default: admin
+# Translators: a "tenant" in OpenStack world is
+# an entity that contains one or more username/password couples.
+# It's typically the tenant that will be used for billing. Having more than one
+# username/password is very helpful in larger organization.
+# You're advised to either keep "tenant" without translating it
+# or keep it parenthezised. Example for French:
+# locataire ("tenant")
+_Description: Authentication server tenant name:
+ Please specify the authentication server tenant name.
+
+Template: ceilometer/admin-user
+Type: string
+Default: admin
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
+
+Template: ceilometer/admin-password
+Type: password
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.