summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlawek Kaplonski <skaplons@redhat.com>2018-10-31 13:02:34 +0100
committerSlawek Kaplonski <skaplons@redhat.com>2018-10-31 13:03:56 +0100
commite8aadb4c5848aae5d8de973202b9f9b8d08c576b (patch)
tree080775b555058175fd4c5d28276cf457a6bbfd4f
parentc980848048ab90078c8c4d5e3b051265a1b12ede (diff)
remove external_network_bridge optionHEADmaster
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
Notes
Notes (review): Code-Review+2: sean mooney <work@seanmooney.info> Workflow+1: sean mooney <work@seanmooney.info> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 12 Nov 2018 18:12:29 +0000 Reviewed-on: https://review.openstack.org/614477 Project: openstack/networking-ovs-dpdk Branch: refs/heads/master
-rw-r--r--devstack/libs/ovs-dpdk15
1 files changed, 0 insertions, 15 deletions
diff --git a/devstack/libs/ovs-dpdk b/devstack/libs/ovs-dpdk
index 41efaa4..f90e926 100644
--- a/devstack/libs/ovs-dpdk
+++ b/devstack/libs/ovs-dpdk
@@ -645,15 +645,6 @@ function install_ovs_dpdk {
645 ovs_dpdk_add_bridge $OVS_BRIDGE 645 ovs_dpdk_add_bridge $OVS_BRIDGE
646} 646}
647 647
648function 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
657function ovs_dpdk_configure_firewall_driver { 648function ovs_dpdk_configure_firewall_driver {
658 if [[ ! -z "$OVS_ENABLE_SG_FIREWALL_MULTICAST" && "$OVS_ENABLE_SG_FIREWALL_MULTICAST" == "True" ]]; then 649 if [[ ! -z "$OVS_ENABLE_SG_FIREWALL_MULTICAST" && "$OVS_ENABLE_SG_FIREWALL_MULTICAST" == "True" ]]; then
659 iniset /$Q_PLUGIN_CONF_FILE ovs enable_sg_firewall_multicast $OVS_ENABLE_SG_FIREWALL_MULTICAST 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
663function ovs_dpdk_configure_l3_agent { 654function ovs_dpdk_configure_l3_agent {
664 Q_USE_PROVIDERNET_FOR_PUBLIC=$(trueorfalse False Q_USE_PROVIDERNET_FOR_PUBLIC)
665 Q_USE_PUBLIC_VETH=$(trueorfalse False Q_USE_PUBLIC_VETH) 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 if [ "$Q_USE_PUBLIC_VETH" == "True" ]; then 656 if [ "$Q_USE_PUBLIC_VETH" == "True" ]; then
672 ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 || 657 ip link show $Q_PUBLIC_VETH_INT > /dev/null 2>&1 ||
673 sudo ip link add $Q_PUBLIC_VETH_INT type veth peer name $Q_PUBLIC_VETH_EX 658 sudo ip link add $Q_PUBLIC_VETH_INT type veth peer name $Q_PUBLIC_VETH_EX