diff options
| author |   Justin chi <chigang@huawei.com> | 2017-10-29 12:54:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-29 12:54:43 +0000 |
| commit | 805cbb914fa5927b4b04ea124870c66ecbcba6cc (patch) | |
| tree | 46702d21f6a05c5584d9a0e845841aa447e19f36 /plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml | |
| parent | 776e32b0068535b65b29c52e39167962ef9a90f8 (diff) | |
| parent | 60fa3597d93a9ba488c875eb0b47cf7054a2eddd (diff) | |
Merge "Remove ugly code in odl plugin"
Diffstat (limited to 'plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml')
| -rwxr-xr-x | plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml index b54fce22..d8bcf154 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml @@ -10,16 +10,9 @@ shell: > crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers opendaylight_v2; crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan; - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True"; + crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini ovs; + crudini --del /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup firewall_driver; crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security; - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings - "{{ contr_l2_mappings }}"; - -- name: configure bridge_mappings for L3 - shell: > - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs bridge_mappings - "{{ contr_l3_mappings }}"; - when: odl_l3_agent == "Enable" - name: turn off l3 ha for odl l2 shell: | |