From 7448edb031028af2e26e17bce6373d8f8929570d Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Wed, 11 Mar 2015 20:06:26 -0500 Subject: [PATCH] Keystone use new section for eventlet server options Configuration options that are only relevant when running keystone under eventlet (rather than Apache httpd) were moved to the [eventlet_server] and [eventlet_server_ssl] groups in the keystone.conf file to avoid confusion. This change updates devstack to use the new non-deprecated group for these options. Change-Id: I651a278d09f6a3a32b2e96fac87f1e5ea0f18c39 --- lib/keystone | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/keystone b/lib/keystone index b7acb37931..97307b169b 100644 --- a/lib/keystone +++ b/lib/keystone @@ -227,21 +227,21 @@ function configure_keystone { # Set the URL advertised in the ``versions`` structure returned by the '/' route 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" + iniset $KEYSTONE_CONF eventlet_server admin_bind_host "$KEYSTONE_ADMIN_BIND_HOST" # Register SSL certificates if provided if is_ssl_enabled_service key; then ensure_certificates KEYSTONE - iniset $KEYSTONE_CONF ssl enable True - iniset $KEYSTONE_CONF ssl certfile $KEYSTONE_SSL_CERT - iniset $KEYSTONE_CONF ssl keyfile $KEYSTONE_SSL_KEY + iniset $KEYSTONE_CONF eventlet_server_ssl enable True + iniset $KEYSTONE_CONF eventlet_server_ssl certfile $KEYSTONE_SSL_CERT + iniset $KEYSTONE_CONF eventlet_server_ssl keyfile $KEYSTONE_SSL_KEY fi if is_service_enabled tls-proxy; then # 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 admin_port $KEYSTONE_AUTH_PORT_INT + iniset $KEYSTONE_CONF eventlet_server public_port $KEYSTONE_SERVICE_PORT_INT + iniset $KEYSTONE_CONF eventlet_server admin_port $KEYSTONE_AUTH_PORT_INT fi iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN" @@ -317,7 +317,7 @@ function configure_keystone { iniset $KEYSTONE_CONF DEFAULT max_token_size 16384 - iniset $KEYSTONE_CONF DEFAULT admin_workers "$API_WORKERS" + iniset $KEYSTONE_CONF eventlet_server admin_workers "$API_WORKERS" # Public workers will use the server default, typically number of CPU. }