Merge "Remove redundant br-int check"
This commit is contained in:
commit
a4089d24e2
@ -119,9 +119,6 @@ WhiteboxNeutronPluginOptions = [
|
|||||||
cfg.StrOpt('ml2_plugin_config',
|
cfg.StrOpt('ml2_plugin_config',
|
||||||
default='/etc/neutron/plugins/ml2/ml2_conf.ini',
|
default='/etc/neutron/plugins/ml2/ml2_conf.ini',
|
||||||
help='Path to ml2 plugin config.'),
|
help='Path to ml2 plugin config.'),
|
||||||
cfg.StrOpt('node_integration_bridge',
|
|
||||||
default='br-int',
|
|
||||||
help="OpenvSwitch bridge dedicated for OVN's use."),
|
|
||||||
cfg.StrOpt('ext_bridge',
|
cfg.StrOpt('ext_bridge',
|
||||||
default='{"default": "ospbr", "alt": "br-ex"}',
|
default='{"default": "ospbr", "alt": "br-ex"}',
|
||||||
help="Bridge dedicated for external network. Dict with values "
|
help="Bridge dedicated for external network. Dict with values "
|
||||||
|
@ -119,13 +119,6 @@ class GatewayMtuTest(base.TrafficFlowTest):
|
|||||||
def _validate_environment_config(self):
|
def _validate_environment_config(self):
|
||||||
msg = "ovn_emit_need_to_frag is not set to 'true' in config file"
|
msg = "ovn_emit_need_to_frag is not set to 'true' in config file"
|
||||||
for node in self.nodes:
|
for node in self.nodes:
|
||||||
result = node['client'].exec_command(
|
|
||||||
"sudo ovs-appctl -t ovs-vswitchd dpif/show-dp-features {} | "
|
|
||||||
"grep 'Check pkt'".format(
|
|
||||||
WB_CONF.node_integration_bridge))
|
|
||||||
if 'Yes' not in result:
|
|
||||||
raise self.skipException(
|
|
||||||
"Path MTU discovery is not supported")
|
|
||||||
if WB_CONF.openstack_type == 'devstack':
|
if WB_CONF.openstack_type == 'devstack':
|
||||||
if node['is_controller'] is False:
|
if node['is_controller'] is False:
|
||||||
continue
|
continue
|
||||||
|
Loading…
Reference in New Issue
Block a user