1. devstack
  2. Commit 47bcf4fbcb6572cb72a8f4e268a09bf3edff23d8
Browse code

Removed neutron_plugin_configure_debug_command functions

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

Ihar Hrachyshka authored on 2017/01/14 03:27:38
Showing 8 changed files
lib/neutron_plugins/README.md
History View file @ 47bcf4f
... ... 
@@ -24,7 +24,6 @@ functions
24 24 
 * ``neutron_plugin_configure_common`` :
25 25 
   set plugin-specific variables, ``Q_PLUGIN_CONF_PATH``, ``Q_PLUGIN_CONF_FILENAME``,
26 26 
   ``Q_PLUGIN_CLASS``
27 
-* ``neutron_plugin_configure_debug_command``
28 27 
 * ``neutron_plugin_configure_dhcp_agent``
29 28 
 * ``neutron_plugin_configure_l3_agent``
30 29 
 * ``neutron_plugin_configure_plugin_agent``
lib/neutron_plugins/bigswitch_floodlight
History View file @ 47bcf4f
... ... 
@@ -26,10 +26,6 @@ function neutron_plugin_configure_common {
26 26 
     BS_FL_CONTROLLER_TIMEOUT=${BS_FL_CONTROLLER_TIMEOUT:-10}
27 27 
 }
28 28
29 
-function neutron_plugin_configure_debug_command {
30 
-    _neutron_ovs_base_configure_debug_command
31 
-}
32 
-
33 29 
 function neutron_plugin_configure_dhcp_agent {
34 30 
     :
35 31 
 }
lib/neutron_plugins/brocade
History View file @ 47bcf4f
... ... 
@@ -49,10 +49,6 @@ function neutron_plugin_configure_service {
49 49
50 50 
 }
51 51
52 
-function neutron_plugin_configure_debug_command {
53 
-    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge
54 
-}
55 
-
56 52 
 function neutron_plugin_configure_dhcp_agent {
57 53 
     iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport
58 54 
 }
lib/neutron_plugins/cisco
History View file @ 47bcf4f
... ... 
@@ -45,7 +45,6 @@ source $TOP_DIR/lib/neutron_plugins/openvswitch
45 45 
 _prefix_function neutron_plugin_create_nova_conf ovs
46 46 
 _prefix_function neutron_plugin_install_agent_packages ovs
47 47 
 _prefix_function neutron_plugin_configure_common ovs
48 
-_prefix_function neutron_plugin_configure_debug_command ovs
49 48 
 _prefix_function neutron_plugin_configure_dhcp_agent ovs
50 49 
 _prefix_function neutron_plugin_configure_l3_agent ovs
51 50 
 _prefix_function neutron_plugin_configure_plugin_agent ovs
... ... 
@@ -83,10 +82,6 @@ function neutron_plugin_configure_common {
83 83 
     Q_PLUGIN_CLASS="neutron.plugins.cisco.network_plugin.PluginV2"
84 84 
 }
85 85
86 
-function neutron_plugin_configure_debug_command {
87 
-    :
88 
-}
89 
-
90 86 
 function neutron_plugin_configure_dhcp_agent {
91 87 
     iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport
92 88 
 }
lib/neutron_plugins/linuxbridge_agent
History View file @ 47bcf4f
... ... 
@@ -39,10 +39,6 @@ function neutron_plugin_install_agent_packages {
39 39 
     install_package bridge-utils
40 40 
 }
41 41
42 
-function neutron_plugin_configure_debug_command {
43 
-    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge
44 
-}
45 
-
46 42 
 function neutron_plugin_configure_dhcp_agent {
47 43 
     local conf_file=$1
48 44 
     :
lib/neutron_plugins/nuage
History View file @ 47bcf4f
... ... 
@@ -33,10 +33,6 @@ function neutron_plugin_configure_common {
33 33 
     NUAGE_CNA_DEF_NETPART_NAME=${NUAGE_CNA_DEF_NETPART_NAME:-''}
34 34 
 }
35 35
36 
-function neutron_plugin_configure_debug_command {
37 
-    :
38 
-}
39 
-
40 36 
 function neutron_plugin_configure_dhcp_agent {
41 37 
     :
42 38 
 }
lib/neutron_plugins/openvswitch_agent
History View file @ 47bcf4f
... ... 
@@ -23,10 +23,6 @@ function neutron_plugin_install_agent_packages {
23 23 
     _neutron_ovs_base_install_agent_packages
24 24 
 }
25 25
26 
-function neutron_plugin_configure_debug_command {
27 
-    _neutron_ovs_base_configure_debug_command
28 
-}
29 
-
30 26 
 function neutron_plugin_configure_dhcp_agent {
31 27 
     local conf_file=$1
32 28 
     :
lib/neutron_plugins/ovs_base
History View file @ 47bcf4f
... ... 
@@ -77,14 +77,6 @@ function _neutron_ovs_base_install_agent_packages {
77 77 
     fi
78 78 
 }
79 79
80 
-function _neutron_ovs_base_configure_debug_command {
81 
-    if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" = "True" ]; then
82 
-        iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge ""
83 
-    else
84 
-        iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
85 
-    fi
86 
-}
87 
-
88 80 
 function _neutron_ovs_base_configure_firewall_driver {
89 81 
     if [[ "$Q_USE_SECGROUP" == "True" ]]; then
90 82 
         iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver iptables_hybrid