openstack/devstack
Code Issues Proposed changes

Remove unused keystone params from neutron agents' config files

Browse Source 
DHCP, L3 and Metadata agents' config files no longer need to
duplicate this info; it's available in neutron.conf

Change-Id: I7bea25d1c2b9249ddacce3f4638f7a8ed4f43197
This commit is contained in:
armando-migliaccio 2013-08-01 10:44:22 -07:00
parent bc522d87f8
commit 05901f46f7
1 changed files with 0 additions and 4 deletions

4
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() {