X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fneutron-server.templates;h=17408264ee739de201243204be31ae03784043e1;hb=2c9341a103d67f180aeb1c0e1f2b3f094e4a4696;hp=5d4e59234abc12dab091cf78b533d0f2c6788fd8;hpb=bec5fbe8093ddcabd0b05b92e496e7ae794c4b42;p=openstack-build%2Fneutron-build.git

diff --git a/trusty/debian/neutron-server.templates b/trusty/debian/neutron-server.templates
index 5d4e59234..17408264e 100644
--- a/trusty/debian/neutron-server.templates
+++ b/trusty/debian/neutron-server.templates
@@ -16,7 +16,8 @@ _Description: Register Neutron 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: neutron/keystone-ip
 Type: string
@@ -24,11 +25,25 @@ _Description: Keystone server IP address:
  Please enter the IP address of the Keystone server, so that neutron-api can
  contact Keystone to do the Neutron service and endpoint creation.
 
-Template: neutron/keystone-auth-token
+Template: neutron/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: neutron/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: neutron/keystone-admin-password
 Type: password
-_Description: Keystone authentication token:
- To configure its endpoint in Keystone, neutron-server 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: neutron/endpoint-ip
 Type: string