Merge "Add parameter OVNEncapTos"

deployment/ovn/ovn-controller-container-puppet.yaml

@@ -97,6 +97,15 @@ parameters:
     default: ""
     tags:
       - role_specific
+  OVNEncapTos:
+    description: >
+      The value to be applied to OVN tunnel interface's option:tos as
+      specified in the Open_vSwitch database Interface table. This
+      feature is supported from OVN v21.12.0.
+    type: string
+    default: "0"
+    tags:
+      - role_specific
   OvsHwOffload:
     default: false
     description: |
@@ -205,6 +214,7 @@ resources:
                     - - OVNCMSOptions
                       - ",availability-zones="
                       - {get_param: OVNAvailabilityZone}
+              ovn::controller::ovn_encap_tos: OVNEncapTos
               vswitch::ovs::enable_hw_offload: OvsHwOffload
               container_cpuset_cpus: OVNContainerCpusetCpus
               ContainerOvnControllerImage: ContainerOvnControllerImage
@@ -213,6 +223,7 @@ resources:
           - values:
               NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
               OVNCMSOptions: {get_param: OVNCMSOptions}
+              OVNEncapTos: {get_param: OVNEncapTos}
               OvsHwOffload: {get_param: OvsHwOffload}
               OVNContainerCpusetCpus: {get_param: OVNContainerCpusetCpus}
               ContainerOvnControllerImage: {get_param: ContainerOvnControllerImage}

releasenotes/notes/OVNEncapTos-d3312e58600050b3.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Added parameter OVNEncapTos to indicates the value to be applied to
+    the OVN tunnel inteface's option:tos, as specified in the
+    Open_vSwitch database Interface table. The default value is "0".
+    "inherit" allows to copy the inner ToS into the outer packet header.