diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-01-28 10:45:27 +0800 |
|---|---|---|
| committer | shuai chen <chenshuai@huawei.com> | 2016-01-29 01:01:02 +0000 |
| commit | fdfbee6103a0498dbaf727918ccf6e2e5e09cb55 (patch) | |
| tree | 9ca5bbb30bbf14b902abe7e5d6a873fd3e892422 /deploy/adapters/ansible | |
| parent | 117e7f19652f4132f50b3f30010fa6dc38b8a468 (diff) | |
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)
Diffstat (limited to 'deploy/adapters/ansible')
| -rwxr-xr-x | deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml | 24 |
1 files changed, 9 insertions, 15 deletions
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 565e12e4..69c9d83d 100755 --- 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 |