bugfix: l3 fwd for odl

JIRA: COMPASS-289

Change-Id: I5a9ec973cca73a68b394b484718a9c9a73361d7a
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit 9d407429fabe6490fabb9418b6b920bc40cdbc12)

diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
index 565e12e..69c9d83 100755 (executable)
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
@@ -83,11 +83,6 @@
 #  notify:
 #    - restart odl service
 
-- name: create jetty config
-  template:
-    src: jetty.xml
-    dest: "{{ odl_home }}/etc/jetty.xml"
-
 - name: install odl pip packages
   pip: name={{ item }} state=present
   with_items: odl_pip
@@ -150,14 +145,6 @@
 #- name: copy Jolokia-OSGi jar config
 #  copy: src=roles/odl_cluster/templates/jolokia-osgi-1.1.5.jar  dest="{{ odl_home }}/system/org/jolokia/jolokia-osgi/1.1.5/"
 
-- name: create odl haproxy config file
-  template:
-    src: haproxy-odl.cfg
-    dest: "/opt/haproxy-odl.cfg"
-
-- name: add odl haproxy configuration to haproxy.cfg
-  shell: "cat /opt/haproxy-odl.cfg >> /etc/haproxy/haproxy.cfg"
-
 - name: remove karaf data directory
   shell: rm -rf {{ odl_home }}/data/*;
 
@@ -202,6 +189,15 @@
 - name: run openvswitch script
   include: openvswitch.yml
 
+- name: add patch-port and normal flow table
+  shell: ovs-vsctl add-port br-int patch-br-prv;
+         ovs-vsctl set Interface patch-br-prv type=patch;
+         ovs-vsctl set Interface patch-br-prv options:peer=patch-int;
+         ovs-vsctl add-port br-prv patch-int;
+         ovs-vsctl set Interface patch-int type=patch;
+         ovs-vsctl set Interface patch-int options:peer=patch-br-prv;
+         ovs-ofctl -O OpenFlow13 add-flow br-int "table=0, priority=0 actions=NORMAL";
+  ignore_errors: True  
 
 #- name: Configure Neutron1
 #  shell: >
@@ -241,5 +237,3 @@
 - name: restart neutron-metadata-agent server
   service: name=neutron-metadata-agent state=restarted
 
-- name: restart haproxy server
-  service: name=haproxy state=restarted