openstack/devstack
Code Issues Proposed changes

Fix keystone auth parameter to neutron conf

Browse Source 
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
This commit is contained in:
Hirofumi Ichihara
2014-09-03 10:03:33 +09:00
parent 0a8c555079
commit 469a6d8f66
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/neutron
View File

@@ -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