openstack/devstack
Code Issues Proposed changes

Keystone stop using config refs

Browse Source 
- Rather than using config refs, deployments should be using a tool
   such as chef or puppet to set the options correctly.

 - Config refs have a bug where you can only reference an option in
   the DEFAULT group, which limits the usefulness, and with this
   feature it's impossible to move any config options out of the
   DEFAULT group, luckily this has been ignored anyways since I think
   everyone realizes how broken it is.

Change-Id: I74cae09f9d75177f8efea69e7ae981ed8f14039f
This commit is contained in:
Brant Knudson 2015-03-14 12:14:31 -05:00
parent f6fd39f974
commit ad13c0a8da
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/keystone
View File

@ -234,13 +234,8 @@ function configure_keystone {
fi
# Set the URL advertised in the ``versions`` structure returned by the '/' route
if is_service_enabled tls-proxy; then
iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/"
iniset $KEYSTONE_CONF DEFAULT admin_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/"
else
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/"
fi
iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/"
iniset $KEYSTONE_CONF DEFAULT admin_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/"
iniset $KEYSTONE_CONF DEFAULT admin_bind_host "$KEYSTONE_ADMIN_BIND_HOST"
# Register SSL certificates if provided