commit 469a6d8f663bc335bdb86248a951065c2260a0cb
author Hirofumi Ichihara <ichihara.hirofumi@gmail.com> Wed Sep 03 10:03:33 2014 +0900
committer Hirofumi Ichihara <ichihara.hirofumi@gmail.com> Fri Sep 05 11:26:02 2014 +0900
tree 038773cfe34f8ebbfacee5b1097827773dcd00f6
parent 0a8c555079fefdbff73852df38fa513a66d0bea4

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

diff --git a/lib/neutron b/lib/neutron
index a00664e..71d30b3 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -939,8 +939,12 @@
     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