aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-09-18 02:48:32 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-18 02:48:32 +0000
commit38b6e6d72f7f598f9bfedf0c32e9c345783ffe53 (patch)
treef732566269ba49324f8cc6cfe1ed5a27e21ebb22
parentf06657863363d316b0e9f95830c2a753012b4e89 (diff)
parentcf11ce9b6d03365758e8ee9ad43f64b8170374a6 (diff)
Merge "Skip openvswitch reinstall task for sfc"HEADmaster
-rw-r--r--deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
index 2deecb3..0ad47d3 100644
--- a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
@@ -19,8 +19,10 @@
- include_vars: "{{ ansible_os_family }}.yml"
when:
+ - odl_sfc is not defined or odl_sfc != "Enable"
- NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight"
- include: odl.yml
when:
+ - odl_sfc is not defined or odl_sfc != "Enable"
- NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight"