Browse code
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
Hirofumi Ichihara authored on 2014/09/03 10:03:33Showing 1 changed files
| ... | ... |
@@ -939,8 +939,12 @@ function _neutron_setup_keystone {
|
| 939 | 939 |
local use_auth_url=$3 |
| 940 | 940 |
local skip_auth_cache=$4 |
| 941 | 941 |
|
| 942 |
- iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI |
|
| 943 |
- iniset $conf_file $section identity_uri $KEYSTONE_AUTH_URI |
|
| 942 |
+ if [[ -n $use_auth_url ]]; then |
|
| 943 |
+ iniset $conf_file $section auth_url $KEYSTONE_SERVICE_URI/v2.0 |
|
| 944 |
+ else |
|
| 945 |
+ iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI |
|
| 946 |
+ iniset $conf_file $section identity_uri $KEYSTONE_AUTH_URI |
|
| 947 |
+ fi |
|
| 944 | 948 |
iniset $conf_file $section admin_tenant_name $SERVICE_TENANT_NAME |
| 945 | 949 |
iniset $conf_file $section admin_user $Q_ADMIN_USERNAME |
| 946 | 950 |
iniset $conf_file $section admin_password $SERVICE_PASSWORD |