Merge "Add NeutronPermittedEthertypes on OVS agent" into stable/queens

puppet/services/neutron-ovs-agent.yaml

@@ -96,10 +96,16 @@ 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:
 
@@ -178,6 +184,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:
         fluentd:
           tripleo_fluentd_groups_neutron_ovs_agent:

releasenotes/notes/neutron-permitted-ethertypes-80dc7f2154786881.yaml

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