Browse Source

remove external_network_bridge option

The external_network_bridge option is deprecated/legacy and being
removed from neutron [1]. This patch removes the external_network_bridge
option iniset from networking-ovs-dpdk devstack plugin.

[1] https://review.openstack.org/#/c/567369/

Change-Id: Ibefaaabdd265925f2d495474782a58efd540edca
Slawek Kaplonski 5 months ago
parent
commit
e8aadb4c58
1 changed files with 0 additions and 15 deletions
  1. 0
    15
      devstack/libs/ovs-dpdk

+ 0
- 15
devstack/libs/ovs-dpdk View File

@@ -645,15 +645,6 @@ function install_ovs_dpdk {
645 645
     ovs_dpdk_add_bridge $OVS_BRIDGE
646 646
 }
647 647
 
648
-function ovs_dpdk_configure_debug_command {
649
-    Q_USE_PROVIDERNET_FOR_PUBLIC=$(trueorfalse False Q_USE_PROVIDERNET_FOR_PUBLIC)
650
-    if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" == "True" ]; then
651
-        iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge ""
652
-    else
653
-        iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
654
-    fi
655
-}
656
-
657 648
 function ovs_dpdk_configure_firewall_driver {
658 649
     if [[ ! -z "$OVS_ENABLE_SG_FIREWALL_MULTICAST" && "$OVS_ENABLE_SG_FIREWALL_MULTICAST" == "True" ]]; then
659 650
         iniset /$Q_PLUGIN_CONF_FILE ovs enable_sg_firewall_multicast $OVS_ENABLE_SG_FIREWALL_MULTICAST
@@ -661,13 +652,7 @@ function ovs_dpdk_configure_firewall_driver {
661 652
 }
662 653
 
663 654
 function ovs_dpdk_configure_l3_agent {
664
-    Q_USE_PROVIDERNET_FOR_PUBLIC=$(trueorfalse False Q_USE_PROVIDERNET_FOR_PUBLIC)
665 655
     Q_USE_PUBLIC_VETH=$(trueorfalse False Q_USE_PUBLIC_VETH)
666
-    if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" == "True" ]; then
667
-        iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge ""
668
-    else
669
-        iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
670
-    fi
671 656
     if [ "$Q_USE_PUBLIC_VETH" == "True" ]; then
672 657
         ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 ||
673 658
         sudo ip link add $Q_PUBLIC_VETH_INT type veth peer name $Q_PUBLIC_VETH_EX

Loading…
Cancel
Save