diff options
Diffstat (limited to 'plugins/odl_sfc/roles')
| -rwxr-xr-x | plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml | 35 | ||||
| -rwxr-xr-x | plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml | 11 |
2 files changed, 4 insertions, 42 deletions
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml index 2527852e..e0a9088f 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml @@ -4,41 +4,10 @@ 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; -- name: configure bridge_mappings -> ml2 - shell: | - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \ - ovs bridge_mappings "{{ contr_l2_mappings }}"; - when: - - odl_l3_agent == "Disable" - - inventory_hostname not in groups['nova_compute'] - -- name: configure bridge_mappings -> ml2 - shell: | - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \ - ovs bridge_mappings "{{ compu_l2_mappings }}"; - when: - - odl_l3_agent == "Disable" - - inventory_hostname in groups['nova_compute'] - -- 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" - - inventory_hostname not in groups['nova_compute'] - -- name: configure bridge_mappings for L3 - shell: | - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini \ - ovs bridge_mappings "{{ compu_l3_mappings }}"; - when: - - odl_l3_agent == "Enable" - - inventory_hostname in groups['nova_compute'] - - name: configure external bridge name for L2 shell: | crudini --set /etc/neutron/l3_agent.ini \ 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: | |