Add NeutronPermittedEthertypes on OVS agent

Adds support for configuring additional ethernet types in neutron
security groups. See https://review.opendev.org/#/c/668224 for related
neutron change.

Note: this backports a change that involves a file merge and restructuring
(puppet/services/neutron-ovs-agent.yaml=>deployment/neutron-ovs-agent-container-puppet.yaml)

Related-Bug: #1832758
Conflicts:
  deployment/neutron/neutron-ovs-agent-container-puppet.yaml

Depends-On: I9ed539745a705936d9a5110a9cfb05c2f28b0bbb
Change-Id: I692dee9343906f2103fc6cf9f9f5944b81dbe8ec
(cherry picked from commit 5d2951d72d)
This commit is contained in:
Brent Eagles 2019-07-09 10:18:44 -02:30
parent 59a5f8338f
commit 16442fcce2
2 changed files with 16 additions and 0 deletions

View File

@ -100,9 +100,15 @@ parameters:
Set or un-set the tunnel header checksum on outgoing IP packet
carrying GRE/VXLAN tunnel.
type: boolean
NeutronPermittedEthertypes:
default: []
description: |
Set additional ethertypes to to be configured on neutron firewalls.
type: comma_delimited_list
conditions:
no_firewall_driver: {equals : [{get_param: NeutronOVSFirewallDriver}, '']}
ethertypes_unset: {equals : [{get_param: NeutronPermittedEthertypes}, []]}
resources:
@ -173,6 +179,11 @@ outputs:
- no_firewall_driver
- {}
- neutron::agents::ml2::ovs::firewall_driver: {get_param: NeutronOVSFirewallDriver}
-
if:
- ethertypes_unset
- {}
- neutron::agents::ml2::ovs::permitted_ethertypes: {get_param: NeutronPermittedEthertypes}
service_config_settings:
collectd:
tripleo.collectd.plugins.neutron_ovs_agent:

View File

@ -0,0 +1,5 @@
---
features:
- |
Added NeutronPermittedEthertypes to allow configuring additional ethertypes
on neutron security groups for L2 agents that support it.