aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/odl_sfc/roles/setup-odl-sfc/tasks
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-10-29 12:54:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-29 12:54:43 +0000
commit805cbb914fa5927b4b04ea124870c66ecbcba6cc (patch)
tree46702d21f6a05c5584d9a0e845841aa447e19f36 /plugins/odl_sfc/roles/setup-odl-sfc/tasks
parent776e32b0068535b65b29c52e39167962ef9a90f8 (diff)
parent60fa3597d93a9ba488c875eb0b47cf7054a2eddd (diff)
Merge "Remove ugly code in odl plugin"
Diffstat (limited to 'plugins/odl_sfc/roles/setup-odl-sfc/tasks')
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-3.yml35
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-2.yml11
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: |