summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/odl_cluster
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-10-31 06:08:09 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-10-31 22:40:50 -0400
commitd12db678f51a6e9227a30e92cbb909909a8eda1d (patch)
tree9bfd6be9951ef9f39f5ee07edfed0a85f0006f2d /deploy/adapters/ansible/roles/odl_cluster
parent59b0e20b6c1f7f80ce7dcacfa8fb5e1687eefeea (diff)
code refactoring: opendaylight for removing repeatedly files
JIRA: COMPASS-500 Change-Id: Ic3378804550f529e2ca438f2a3f84f3ffc09ef8f Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/odl_cluster')
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/03_00_switch_off_neutron_openvswitch_agent.yml1
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_01_recover_external_network_l2.yml7
2 files changed, 2 insertions, 6 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_00_switch_off_neutron_openvswitch_agent.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_00_switch_off_neutron_openvswitch_agent.yml
index 082d75d4..50359df4 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_00_switch_off_neutron_openvswitch_agent.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_00_switch_off_neutron_openvswitch_agent.yml
@@ -7,7 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
-
- name: remove neutron-openvswitch-agent service daemon
shell: sed -i '/{{ service_ovs_agent_name }}/d' /opt/service ;
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_01_recover_external_network_l2.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_01_recover_external_network_l2.yml
index 9531b4aa..ad204cf9 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_01_recover_external_network_l2.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_03_01_recover_external_network_l2.yml
@@ -7,23 +7,20 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
-
- name: add ovs bridge
openvswitch_bridge: bridge={{ item["name"] }} state=present
with_items: "{{ network_cfg['provider_net_mappings'] }}"
- when: item["type"] == "ovs" and odl_l3_agent == "Disable"
+ when: item["type"] == "ovs"
- name: add ovs uplink
openvswitch_port: bridge={{ item["name"] }} port={{ item["interface"] }} state=present
with_items: "{{ network_cfg['provider_net_mappings'] }}"
- when: item["type"] == "ovs" and odl_l3_agent == "Disable"
+ when: item["type"] == "ovs"
- name: copy recovery script
copy: src={{ item }} dest=/opt/setup_networks
with_items:
- recover_network.py
- when: odl_l3_agent == "Disable"
- name: recover external script
shell: python /opt/setup_networks/recover_network.py
- when: odl_l3_agent == "Disable"