openstack/devstack
Code Issues Proposed changes

Merge "Remove temporary logic for Quantum auth_token transition"

Browse Source
This commit is contained in:
Jenkins 2013-05-24 10:53:27 +00:00 committed by Gerrit Code Review
commit 5a5a089a35
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/quantum
View File

@ -587,10 +587,6 @@ function _configure_quantum_service() {
iniset $QUANTUM_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
_quantum_setup_keystone $QUANTUM_CONF keystone_authtoken
# Comment out keystone authtoken configuration in api-paste.ini
# It is required to avoid any breakage in Quantum where the sample
# api-paste.ini has authtoken configurations.
_quantum_commentout_keystone_authtoken $Q_API_PASTE_FILE filter:authtoken
# Configure plugin
quantum_plugin_configure_service
@ -661,21 +657,6 @@ function _quantum_setup_keystone() {
rm -f $QUANTUM_AUTH_CACHE_DIR/*
}
function _quantum_commentout_keystone_authtoken() {
local conf_file=$1
local section=$2
inicomment $conf_file $section auth_host
inicomment $conf_file $section auth_port
inicomment $conf_file $section auth_protocol
inicomment $conf_file $section auth_url
inicomment $conf_file $section admin_tenant_name
inicomment $conf_file $section admin_user
inicomment $conf_file $section admin_password
inicomment $conf_file $section signing_dir
}
function _quantum_setup_interface_driver() {
# ovs_use_veth needs to be set before the plugin configuration