openstack/devstack
Code Issues Proposed changes

Removed neutron_plugin_configure_debug_command functions

Browse Source 
Those are not called by devstack anymore. This cleanup also gets rid of
code that attempts to set external_network_bridge to an empty value,
which triggers a deprecation warning for the option since it's going to
be removed in a next Neutron release.

Change-Id: I5adcbab877b4e8742522de81b1a85acfc33160d7
This commit is contained in:
Ihar Hrachyshka
2017-01-13 18:27:38 +00:00
parent 5ed1e34802
commit 47bcf4fbcb
8 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/neutron_plugins/README.md
View File

@@ -24,7 +24,6 @@ functions
* ``neutron_plugin_configure_common`` : * ``neutron_plugin_configure_common`` :
set plugin-specific variables, ``Q_PLUGIN_CONF_PATH``, ``Q_PLUGIN_CONF_FILENAME``, set plugin-specific variables, ``Q_PLUGIN_CONF_PATH``, ``Q_PLUGIN_CONF_FILENAME``,
``Q_PLUGIN_CLASS`` ``Q_PLUGIN_CLASS``
* ``neutron_plugin_configure_debug_command``
* ``neutron_plugin_configure_dhcp_agent`` * ``neutron_plugin_configure_dhcp_agent``
* ``neutron_plugin_configure_l3_agent`` * ``neutron_plugin_configure_l3_agent``
* ``neutron_plugin_configure_plugin_agent`` * ``neutron_plugin_configure_plugin_agent``

4
lib/neutron_plugins/bigswitch_floodlight
View File

@@ -26,10 +26,6 @@ function neutron_plugin_configure_common {
BS_FL_CONTROLLER_TIMEOUT=${BS_FL_CONTROLLER_TIMEOUT:-10} BS_FL_CONTROLLER_TIMEOUT=${BS_FL_CONTROLLER_TIMEOUT:-10}
} }
function neutron_plugin_configure_debug_command {
_neutron_ovs_base_configure_debug_command
}
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {
: :
} }

4
lib/neutron_plugins/brocade
View File

@@ -49,10 +49,6 @@ function neutron_plugin_configure_service {
} }
function neutron_plugin_configure_debug_command {
iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge
}
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport
} }

5
lib/neutron_plugins/cisco
View File

@@ -45,7 +45,6 @@ source $TOP_DIR/lib/neutron_plugins/openvswitch
_prefix_function neutron_plugin_create_nova_conf ovs _prefix_function neutron_plugin_create_nova_conf ovs
_prefix_function neutron_plugin_install_agent_packages ovs _prefix_function neutron_plugin_install_agent_packages ovs
_prefix_function neutron_plugin_configure_common ovs _prefix_function neutron_plugin_configure_common ovs
_prefix_function neutron_plugin_configure_debug_command ovs
_prefix_function neutron_plugin_configure_dhcp_agent ovs _prefix_function neutron_plugin_configure_dhcp_agent ovs
_prefix_function neutron_plugin_configure_l3_agent ovs _prefix_function neutron_plugin_configure_l3_agent ovs
_prefix_function neutron_plugin_configure_plugin_agent ovs _prefix_function neutron_plugin_configure_plugin_agent ovs
@@ -83,10 +82,6 @@ function neutron_plugin_configure_common {
Q_PLUGIN_CLASS="neutron.plugins.cisco.network_plugin.PluginV2" Q_PLUGIN_CLASS="neutron.plugins.cisco.network_plugin.PluginV2"
} }
function neutron_plugin_configure_debug_command {
:
}
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport
} }

4
lib/neutron_plugins/linuxbridge_agent
View File

@@ -39,10 +39,6 @@ function neutron_plugin_install_agent_packages {
install_package bridge-utils install_package bridge-utils
} }
function neutron_plugin_configure_debug_command {
iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge
}
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {
local conf_file=$1 local conf_file=$1
: :

4
lib/neutron_plugins/nuage
View File

@@ -33,10 +33,6 @@ function neutron_plugin_configure_common {
NUAGE_CNA_DEF_NETPART_NAME=${NUAGE_CNA_DEF_NETPART_NAME:-''} NUAGE_CNA_DEF_NETPART_NAME=${NUAGE_CNA_DEF_NETPART_NAME:-''}
} }
function neutron_plugin_configure_debug_command {
:
}
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {
: :
} }

4
lib/neutron_plugins/openvswitch_agent
View File

@@ -23,10 +23,6 @@ function neutron_plugin_install_agent_packages {
_neutron_ovs_base_install_agent_packages _neutron_ovs_base_install_agent_packages
} }
function neutron_plugin_configure_debug_command {
_neutron_ovs_base_configure_debug_command
}
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {
local conf_file=$1 local conf_file=$1
: :

8
lib/neutron_plugins/ovs_base
View File

@@ -77,14 +77,6 @@ function _neutron_ovs_base_install_agent_packages {
fi fi
} }
function _neutron_ovs_base_configure_debug_command {
if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" = "True" ]; then
iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge ""
else
iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
fi
}
function _neutron_ovs_base_configure_firewall_driver { function _neutron_ovs_base_configure_firewall_driver {
if [[ "$Q_USE_SECGROUP" == "True" ]]; then if [[ "$Q_USE_SECGROUP" == "True" ]]; then
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver iptables_hybrid iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver iptables_hybrid