Remove temporary logic for Quantum auth_token transition
When Quantum auth_token configuration were moved to quantum.conf,
the temporary logic to disable auth_token in api-paste.ini was added
to avoid gating test failures of patches based on the version with
api-paste.ini auth_token configurations.
This temporary logic is no longer needed.
Change-Id: I539301a338d5ada01c83af5e9cf203849a67c6c1
diff --git a/lib/quantum b/lib/quantum
index dfd73e9..21baaf8 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -581,10 +581,6 @@
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
@@ -655,21 +651,6 @@
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