openstack/devstack
Code Issues Proposed changes

Fix configure to metadata_agent.ini

Browse Source 
Devstack set auth_uri to metadata_agent.ini in _neutron_setup_keystone function.
But Metadata_agent use auth_url not auth_uri.

This is regression caused by https://review.openstack.org/#/c/122882/

Change-Id: Iac8f240558abcdc5bcee3d3c87cef5ad3bb007e8
Closes-bug: #1373859
This commit is contained in:
Hirofumi Ichihara
2014-09-25 20:00:29 +09:00
committed by Hirofumi Ichihara
parent 27f0339f86
commit cc5715531b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/neutron Normal file → Executable file
View File

@@ -921,7 +921,9 @@ function _configure_neutron_metadata_agent {
iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP
iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND" iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
_neutron_setup_keystone $Q_META_CONF_FILE DEFAULT # Configures keystone for metadata_agent
# The third argument "True" sets auth_url needed to communicate with keystone
_neutron_setup_keystone $Q_META_CONF_FILE DEFAULT True
} }
@@ -1066,6 +1068,13 @@ function _neutron_setup_rootwrap {
function _neutron_setup_keystone { function _neutron_setup_keystone {
local conf_file=$1 local conf_file=$1
local section=$2 local section=$2
local use_auth_url=$3
# Configures keystone for metadata_agent
# metadata_agent needs auth_url to communicate with keystone
if [[ "$use_auth_url" == "True" ]]; then
iniset $conf_file $section auth_url $KEYSTONE_SERVICE_URI/v2.0
fi
create_neutron_cache_dir create_neutron_cache_dir
configure_auth_token_middleware $conf_file $Q_ADMIN_USERNAME $NEUTRON_AUTH_CACHE_DIR $section configure_auth_token_middleware $conf_file $Q_ADMIN_USERNAME $NEUTRON_AUTH_CACHE_DIR $section