Browse Source

Merge "Add agent/explicitly_egress_direct support" into stable/train

changes/96/760996/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
3539c43934
3 changed files with 28 additions and 0 deletions
  1. +8
    -0
      manifests/agents/ml2/ovs.pp
  2. +9
    -0
      releasenotes/notes/ovs_agent_explicitly_egress_direct-a5989bd33844c0f4.yaml
  3. +11
    -0
      spec/classes/neutron_agents_ml2_ovs_spec.rb

+ 8
- 0
manifests/agents/ml2/ovs.pp View File

@@ -189,6 +189,12 @@
# (optional) List of <bridge>:<egress_bw>:<ingress_bw>
# Defaults to empty list
#
# [*explicitly_egress_direct*]
# (optional) When set to True, the accepted egress unicast traffic will not
# use action NORMAL. The accepted egress packets will be taken care of in the
# final egress tables direct output flows for unicast traffic. (boolean value)
# Defaults to $::os_service_default
#
# DEPRECATED
#
# [*of_interface*]
@@ -230,6 +236,7 @@ class neutron::agents::ml2::ovs (
$tunnel_csum = $::os_service_default,
$igmp_snooping_enable = $::os_service_default,
$resource_provider_bandwidths = [],
$explicitly_egress_direct = $::os_service_default,
# DEPRECATED
$of_interface = undef,
) {
@@ -338,6 +345,7 @@ class neutron::agents::ml2::ovs (
'agent/extensions': value => join(any2array($extensions), ',');
'agent/minimize_polling': value => $minimize_polling;
'agent/tunnel_csum': value => $tunnel_csum;
'agent/explicitly_egress_direct': value => $explicitly_egress_direct;
'ovs/ovsdb_timeout': value => $ovsdb_timeout;
'ovs/of_connect_timeout': value => $of_connect_timeout;
'ovs/of_request_timeout': value => $of_request_timeout;


+ 9
- 0
releasenotes/notes/ovs_agent_explicitly_egress_direct-a5989bd33844c0f4.yaml View File

@@ -0,0 +1,9 @@
---
features:
- |
Add new configuration parameter explicitly_egress_direct for ML2 OVS agent
When set to True, the accepted egress unicast traffic will not use action
NORMAL. The accepted egress packets will be taken care of in the final
egress tables direct output flows for unicast traffic so that operators can
set customized integration bridge name in l3 agent configuration.
This can be enabled on some nodes to prevent flooding on integration bridge.

+ 11
- 0
spec/classes/neutron_agents_ml2_ovs_spec.rb View File

@@ -67,6 +67,7 @@ describe 'neutron::agents::ml2::ovs' do
should contain_neutron_agent_ovs('agent/tunnel_types').with_ensure('absent')
should contain_neutron_agent_ovs('ovs/igmp_snooping_enable').with_value('<SERVICE DEFAULT>')
should_not contain_neutron_agent_ovs('ovs/resource_provider_bandwidths')
should contain_neutron_agent_ovs('agent/explicitly_egress_direct').with_value(['<SERVICE DEFAULT>'])
end

it 'installs neutron ovs agent package' do
@@ -399,6 +400,16 @@ describe 'neutron::agents::ml2::ovs' do
end
end

context 'with direct output enabled for egress flows' do
before :each do
params.merge!(:explicitly_egress_direct => true)
end

it 'configure neutron/plugins/ml2/ml2_conf.ini' do
should contain_neutron_agent_ovs('agent/explicitly_egress_direct').with_value(true)
end
end

end

on_supported_os({


Loading…
Cancel
Save