[MOS 9.0] Update ceilometer package

[openstack-build/ceilometer-build.git] / trusty / debian / ceilometer-api.templates

diff --git a/trusty/debian/ceilometer-api.templates b/trusty/debian/ceilometer-api.templates
index c280254e22854bbef37b5f03e07186665eb08d82..c91046178a6b428a1e3dc3082570ea68911c6cba 100644 (file)
--- a/trusty/debian/ceilometer-api.templates
+++ b/trusty/debian/ceilometer-api.templates
@@ -16,7 +16,8 @@ _Description: Register Ceilometer in the Keystone endpoint catalog?
  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.
+ 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
@@ -24,11 +25,25 @@ _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 authentication token:
- To configure its endpoint in Keystone, ceilometer-api needs the Keystone
- authentication 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