From ffcccb6b50fe7e5954188b44f6666f7ac3dee3da Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Fri, 29 Jan 2016 17:26:21 +0800 Subject: bugfix: l2 fwd move external bridge on br-ex JIRA: COMPASS-292 Change-Id: I242729b32c8f29e3aafe7ef5797acd14429a2c8c Signed-off-by: chenshuai@huawei.com (cherry picked from commit 0664407eaaf934b909386509f3adafec4387aa37) --- .../roles/odl_cluster/tasks/odl_controller.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'deploy') 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 69c9d83d..b5d940f9 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml @@ -189,15 +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: 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: > @@ -213,6 +213,9 @@ #- name: Execute ML2 Configuration File # command: su -s /bin/sh -c "/opt/ml2_conf.sh;" +- name: configure l3 configuration + shell: crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge br-prv; + - name: drop and recreate neutron database shell: mysql -e "drop database if exists neutron;"; mysql -e "create database neutron character set utf8;"; -- cgit 1.2.3-korg