From 469a6d8f663bc335bdb86248a951065c2260a0cb Mon Sep 17 00:00:00 2001 From: Hirofumi Ichihara Date: Wed, 3 Sep 2014 10:03:33 +0900 Subject: [PATCH] Fix keystone auth parameter to neutron conf Devstack set auth_uri to metadata_agent.ini. But auth_uri is wrong parameter for metadate_agent. This is regression caused by https://review.openstack.org/#/c/94545/ Change-Id: I3dcf1d619b5d204937f072b3fbb9966069793680 Closes-bug: #1364684 --- lib/neutron | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/neutron b/lib/neutron index a00664e6a0..71d30b39db 100644 --- a/lib/neutron +++ b/lib/neutron @@ -939,8 +939,12 @@ function _neutron_setup_keystone { local use_auth_url=$3 local skip_auth_cache=$4 - iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI - iniset $conf_file $section identity_uri $KEYSTONE_AUTH_URI + if [[ -n $use_auth_url ]]; then + iniset $conf_file $section auth_url $KEYSTONE_SERVICE_URI/v2.0 + else + iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI + iniset $conf_file $section identity_uri $KEYSTONE_AUTH_URI + fi iniset $conf_file $section admin_tenant_name $SERVICE_TENANT_NAME iniset $conf_file $section admin_user $Q_ADMIN_USERNAME iniset $conf_file $section admin_password $SERVICE_PASSWORD