From bdd51e937ac81d789c50b0569cafde1d134632f8 Mon Sep 17 00:00:00 2001 From: Janki Chhatbar Date: Tue, 29 May 2018 13:47:34 +0530 Subject: [PATCH] Add flag to enable QoS DSCP marking in ODL 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 in TripleO to enable this parameter via puppet-opendaylight. Change-Id: I3b192c8fc1bc92c1124d3b27c60ad5c0c4dd42f9 --- environments/odl-dscp-marking-inheritance.yaml | 4 ++++ puppet/services/opendaylight-api.yaml | 6 ++++++ .../odl_dscp_marking_inheritance-41e41ff5f0c281d4.yaml | 9 +++++++++ 3 files changed, 19 insertions(+) create mode 100644 environments/odl-dscp-marking-inheritance.yaml create mode 100644 releasenotes/notes/odl_dscp_marking_inheritance-41e41ff5f0c281d4.yaml diff --git a/environments/odl-dscp-marking-inheritance.yaml b/environments/odl-dscp-marking-inheritance.yaml new file mode 100644 index 0000000000..39d78b9c39 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml index b3a78bcfed..8997acfca0 100644 --- a/puppet/services/opendaylight-api.yaml +++ b/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 diff --git a/releasenotes/notes/odl_dscp_marking_inheritance-41e41ff5f0c281d4.yaml b/releasenotes/notes/odl_dscp_marking_inheritance-41e41ff5f0c281d4.yaml new file mode 100644 index 0000000000..6384039518 --- /dev/null +++ b/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. \ No newline at end of file