From 10ef24f25952d674f4c9d3124ac08a475cb12c12 Mon Sep 17 00:00:00 2001 From: Boden R Date: Tue, 5 Mar 2019 07:34:08 -0700 Subject: [PATCH] remove external_network_bridge option The external_network_bridge option is deprecated/legacy and being removed from neutron (see depends patch). This patch removes the external_network_bridge option iniset from our devstack scripts. Depends-On: I07474713206c218710544ad98c08caaa37dbf53a Change-Id: I0fdac5d6b7108a7bdd7ef271843b1349979ae8d8 --- devstack/lib/nsx_v3_p_common | 1 - devstack/lib/vmware_nsx | 1 - devstack/lib/vmware_nsx_tvd | 1 - 3 files changed, 3 deletions(-) diff --git a/devstack/lib/nsx_v3_p_common b/devstack/lib/nsx_v3_p_common index 2e19e15123..0f8e8d8d2e 100644 --- a/devstack/lib/nsx_v3_p_common +++ b/devstack/lib/nsx_v3_p_common @@ -164,7 +164,6 @@ function neutron_plugin_configure_common_v3 { function neutron_plugin_configure_debug_command { sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE - iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge "$PUBLIC_BRIDGE" } function neutron_plugin_configure_dhcp_agent { diff --git a/devstack/lib/vmware_nsx b/devstack/lib/vmware_nsx index 40dbcf0109..1d56346b97 100644 --- a/devstack/lib/vmware_nsx +++ b/devstack/lib/vmware_nsx @@ -76,7 +76,6 @@ function neutron_plugin_configure_common { function neutron_plugin_configure_debug_command { sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE - iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge "$PUBLIC_BRIDGE" } function neutron_plugin_configure_dhcp_agent { diff --git a/devstack/lib/vmware_nsx_tvd b/devstack/lib/vmware_nsx_tvd index 8cb5c1d5c7..09ab068b74 100644 --- a/devstack/lib/vmware_nsx_tvd +++ b/devstack/lib/vmware_nsx_tvd @@ -131,7 +131,6 @@ function neutron_plugin_configure_common { function neutron_plugin_configure_debug_command { sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE - iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge "$PUBLIC_BRIDGE" } function neutron_plugin_configure_dhcp_agent {