Merge "Add flag to enable QoS DSCP marking in ODL"

environments/odl-dscp-marking-inheritance.yaml

@@ -0,0 +1,4 @@
+# This flag enables copying of DSCP markings to VXLAN tunnel header when
+# OpenDaylight is enabled.
+parameter_defaults:
+  OpenDaylightInheritDSCPMarking: true

puppet/services/opendaylight-api.yaml

@@ -88,6 +88,10 @@ parameters:
     type: string
     description: Specifies the default CA cert to use if TLS is used for
                  services in the internal network.
+  OpenDaylightInheritDSCPMarking:
+    description: Enable DSCP marking for VXLAN/GRE tunnels
+    type: boolean
+    default: false
 
 parameter_groups:
 - label: deprecated
@@ -145,6 +149,8 @@ outputs:
                   - 8185
             opendaylight::snat_mechanism: {get_param: OpenDaylightSNATMechanism}
             opendaylight::log_mechanism: {get_param: OpenDaylightLogMechanism}
+            opendaylight::inherit_dscp_marking: {get_param: OpenDaylightInheritDSCPMarking}
+
           -
             if:
               - internal_tls_enabled

releasenotes/notes/odl_dscp_marking_inheritance-41e41ff5f0c281d4.yaml

@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    In OpenDaylight, a config parameter is available to enable DSCP
+    marking inheritance for packets egressing out of OVS through
+    VXLAN/GRE tunnels. Add a flag "OpenDaylightInheritDSCPMarking" in
+    TripleO to enable this parameter via puppet-opendaylight. If the
+    flag is set to 'true', DSCP marking feature is enabled in
+    OpenDaylight.