From 05901f46f75e1c80a2448bda463e1dd6b937e7e7 Mon Sep 17 00:00:00 2001
From: armando-migliaccio <amigliaccio@nicira.com>
Date: Thu, 1 Aug 2013 10:44:22 -0700
Subject: [PATCH] Remove unused keystone params from neutron agents' config
files
DHCP, L3 and Metadata agents' config files no longer need to
duplicate this info; it's available in neutron.conf
Change-Id: I7bea25d1c2b9249ddacce3f4638f7a8ed4f43197
---
lib/neutron | 4 ----
1 file changed, 4 deletions(-)
diff --git a/lib/neutron b/lib/neutron
index 835f900425..bfae486633 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -523,7 +523,6 @@ function _configure_neutron_debug_command() {
# be cleaned.
iniset $NEUTRON_TEST_CONFIG_FILE agent root_helper "$Q_RR_COMMAND"
- _neutron_setup_keystone $NEUTRON_TEST_CONFIG_FILE DEFAULT set_auth_url
_neutron_setup_interface_driver $NEUTRON_TEST_CONFIG_FILE
neutron_plugin_configure_debug_command
@@ -540,7 +539,6 @@ function _configure_neutron_dhcp_agent() {
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
- _neutron_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url
_neutron_setup_interface_driver $Q_DHCP_CONF_FILE
neutron_plugin_configure_dhcp_agent
@@ -561,7 +559,6 @@ function _configure_neutron_l3_agent() {
iniset $Q_L3_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
iniset $Q_L3_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
- _neutron_setup_keystone $Q_L3_CONF_FILE DEFAULT set_auth_url
_neutron_setup_interface_driver $Q_L3_CONF_FILE
neutron_plugin_configure_l3_agent
@@ -578,7 +575,6 @@ function _configure_neutron_metadata_agent() {
iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP
iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
- _neutron_setup_keystone $Q_META_CONF_FILE DEFAULT set_auth_url
}
function _configure_neutron_lbaas() {