openstack/devstack
Code Issues Proposed changes

Merge "Set the correct URLs in the version return data"

Browse Source
This commit is contained in:
Jenkins 2013-07-09 02:40:08 +00:00 committed by Gerrit Code Review
commit 53dde9efbb
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/keystone
View File

@ -120,6 +120,10 @@ function configure_keystone() {
iniset $KEYSTONE_CONF identity driver "keystone.identity.backends.ldap.Identity" iniset $KEYSTONE_CONF identity driver "keystone.identity.backends.ldap.Identity"
fi fi
# Set the URL advertised in the ``versions`` structure returned by the '/' route
iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:%(public_port)s/"
iniset $KEYSTONE_CONF DEFAULT admin_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:%(admin_port)s/"
if is_service_enabled tls-proxy; then if is_service_enabled tls-proxy; then
# Set the service ports for a proxy to take the originals # Set the service ports for a proxy to take the originals
iniset $KEYSTONE_CONF DEFAULT public_port $KEYSTONE_SERVICE_PORT_INT iniset $KEYSTONE_CONF DEFAULT public_port $KEYSTONE_SERVICE_PORT_INT