Provide initial config files for sfc

SFC requires that genius uses flow based tunnels and vxlan-gpe. We must
configure that intially in the genius config files

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

diff --git a/tasks/configure_genius_tunnels.yml b/tasks/configure_genius_tunnels.yml
new file mode 100644 (file)
index 0000000..f4ebd3b
--- /dev/null
+++ b/tasks/configure_genius_tunnels.yml
@@ -0,0 +1,23 @@
+- name: Create the config directory
+  file:
+    path: /opt/opendaylight/etc/opendaylight/datastore/initial/config/
+    state: directory
+    mode: "0755"
+    owner: "odl"
+    group: "odl"
+
+- name: Configure Genius to use flow based tunnels
+  template:
+    src: "netvirt-elanmanager-config.xml.j2"
+    dest: "/opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml"
+    mode: "0644"
+    owner: "odl"
+    group: "odl"
+
+- name: Configure Genius to create vxlan-gpe tunnels
+  template:
+    src: "genius-itm-config.xml.j2"
+    dest: "/opt/opendaylight/etc/opendaylight/datastore/initial/config/genius-itm-config.xml"
+    mode: "0644"
+    owner: "odl"
+    group: "odl"

diff --git a/tasks/main.yml b/tasks/main.yml
index 45d597ab7bb1cabba5576e404d52cd33dc250f04..48c91c75dc356b15ebb840a4f7a735598becdea8 100644 (file)
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,4 +3,6 @@
 - include: configure_karaf_features.yml
 - include: configure_nb_rest_port.yml
 - include: open_nb_rest_port.yml
+- include: configure_genius_tunnels.yml
+  when: "'odl-netvirt-sfc' in features"
 - include: start_odl.yml

diff --git a/templates/genius-itm-config.xml.j2 b/templates/genius-itm-config.xml.j2
new file mode 100644 (file)
index 0000000..52b90b1
--- /dev/null
+++ b/templates/genius-itm-config.xml.j2
@@ -0,0 +1,11 @@
+<itm-config xmlns="urn:opendaylight:genius:itm:config">
+    <def-tz-enabled>false</def-tz-enabled>
+    <def-tz-tunnel-type>vxlan</def-tz-tunnel-type>
+    <tunnel-aggregation>
+        <tunnel-type>vxlan</tunnel-type>
+        <enabled>false</enabled>
+    </tunnel-aggregation>
+    <default-tunnel-tos>0</default-tunnel-tos>
+    <gpe-extension-enabled>true</gpe-extension-enabled>
+</itm-config>
+

diff --git a/templates/netvirt-elanmanager-config.xml.j2 b/templates/netvirt-elanmanager-config.xml.j2
new file mode 100644 (file)
index 0000000..9f4b70b
--- /dev/null
+++ b/templates/netvirt-elanmanager-config.xml.j2
@@ -0,0 +1,14 @@
+<elanmanager-config xmlns="urn:opendaylight:netvirt:elan:config">
+  <auto-create-bridge>true</auto-create-bridge>
+  <int-bridge-gen-mac>true</int-bridge-gen-mac>
+  <temp-smac-learn-timeout>10</temp-smac-learn-timeout>
+  <punt-lldp-to-controller>false</punt-lldp-to-controller>
+  <!--
+  <controller-max-backoff>5000</controller-max-backoff>
+  <controller-inactivity-probe>5000</controller-inactivity-probe>
+  -->
+  <auto-config-transport-zones>true</auto-config-transport-zones>
+  <use-of-tunnels>true</use-of-tunnels>
+  <openstack-vni-semantics-enforced>true</openstack-vni-semantics-enforced>
+</elanmanager-config>
+