Merge branch 'fix/trunk-version-interface-qos' into 'develop'

`trunk_interface.j2`: remove QoS from router/interface when version => 2.0

See merge request !273

geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2

@@ -137,9 +137,11 @@
                       <prefix-length>{{(local.ipv6_address| split('/'))[1]}}</prefix-length>
                   </address>
               </ipv6>
+              {% if trunk_version | float < 2.0 %}
               <qos>
                   <network-policy>GEANT_BASIC</network-policy>
               </qos>
+              {% endif %}
           </interface>
       {# Add new LAG trunk into standard protocols #}
       <mpls xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes">