Provide support for both Oxygen and Nitrogen

SFC requires changes in two configs, however those are different in
Nitrogen and Oxygen:

- In Oxygen, flow-based tunnels are configured through an internal
OVS parameter and not by netvirt-elanmanager-config.xml

- In Oxygen, the default value for the def-tz-enabled parameter in
genius-itm-config is true whereas in Nitrogen is false

Change-Id: Ib201354e684d0d8ffb5a6f17267ab96f89cefb64
Signed-off-by: Manuel Buil <mbuil@suse.com>

diff --git a/tasks/configure_genius_tunnels.yml b/tasks/configure_genius_tunnels.yml
index f4ebd3bbca9db5ce9a89f3e4ac4082aea495f210..1779a5d3d88cd13a8934215af379add49ce3460d 100644 (file)
--- a/tasks/configure_genius_tunnels.yml
+++ b/tasks/configure_genius_tunnels.yml
@@ -13,6 +13,9 @@
     mode: "0644"
     owner: "odl"
     group: "odl"
+  when:
+    - odl_version is defined
+    - odl_version == 'nitrogen'
 
 - name: Configure Genius to create vxlan-gpe tunnels
   template:

diff --git a/templates/genius-itm-config.xml.j2 b/templates/genius-itm-config.xml.j2
index 52b90b1993076a3c39e7ce3baf02d5aaced3f810..105273de5dd4ac624df58432560fbec9c5b69f9b 100644 (file)
--- a/templates/genius-itm-config.xml.j2
+++ b/templates/genius-itm-config.xml.j2
@@ -1,5 +1,5 @@
 <itm-config xmlns="urn:opendaylight:genius:itm:config">
-    <def-tz-enabled>false</def-tz-enabled>
+    <def-tz-enabled>{% if odl_version is defined and odl_version == 'nitrogen'%}false{% else %}true{% endif %}</def-tz-enabled>
     <def-tz-tunnel-type>vxlan</def-tz-tunnel-type>
     <tunnel-aggregation>
         <tunnel-type>vxlan</tunnel-type>