openstack/devstack
Code Issues Proposed changes

Merge "Fix keystone auth parameter to neutron conf"

Browse Source
This commit is contained in:
Jenkins 2014-09-15 16:41:45 +00:00 committed by Gerrit Code Review
commit a1c7256946
1 changed files with 6 additions and 2 deletions
Show Stats 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 use_auth_url=$3
local skip_auth_cache=$4 local skip_auth_cache=$4
iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI if [[ -n $use_auth_url ]]; then
iniset $conf_file $section identity_uri $KEYSTONE_AUTH_URI 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_tenant_name $SERVICE_TENANT_NAME
iniset $conf_file $section admin_user $Q_ADMIN_USERNAME iniset $conf_file $section admin_user $Q_ADMIN_USERNAME
iniset $conf_file $section admin_password $SERVICE_PASSWORD iniset $conf_file $section admin_password $SERVICE_PASSWORD