openstack/devstack
Code Issues Proposed changes

keystone: Dot not set the removed admin_endpoint parameter

Browse Source 
The admin_endpoint parameter has been removed from keystone[1], and
setting the parameter is no longer effective.

[1] 192cde56e57a06750641b319da8a72cdcaa554d0

Change-Id: I6ae6a3122668551acc018972624e914fcbb79a22
This commit is contained in:
Takashi Kajinami
2021-05-03 00:08:15 +09:00
committed by Dr. Jens Harbott
parent 94facb0759
commit 65a5db8e33
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/keystone
View File

@@ -214,14 +214,11 @@ function configure_keystone {
service_port=$KEYSTONE_SERVICE_PORT_INT service_port=$KEYSTONE_SERVICE_PORT_INT
fi fi
# Override the endpoints advertised by keystone (the public_endpoint and # Override the endpoints advertised by keystone so that clients use the correct
# admin_endpoint) so that clients use the correct endpoint. By default, the # endpoint. By default, the keystone server uses the public_port which isn't
# keystone server uses the public_port and admin_port which isn't going to # going to work when you want to use a different port (in the case of proxy),
# work when you want to use a different port (in the case of proxy), or you # or you don't want the port (in the case of putting keystone on a path in apache).
# don't want the port (in the case of putting keystone on a path in
# apache).
iniset $KEYSTONE_CONF DEFAULT public_endpoint $KEYSTONE_SERVICE_URI iniset $KEYSTONE_CONF DEFAULT public_endpoint $KEYSTONE_SERVICE_URI
iniset $KEYSTONE_CONF DEFAULT admin_endpoint $KEYSTONE_SERVICE_URI
if [[ "$KEYSTONE_TOKEN_FORMAT" != "" ]]; then if [[ "$KEYSTONE_TOKEN_FORMAT" != "" ]]; then
iniset $KEYSTONE_CONF token provider $KEYSTONE_TOKEN_FORMAT iniset $KEYSTONE_CONF token provider $KEYSTONE_TOKEN_FORMAT