From: Harry Huang <huangxiangyu5@huawei.com>
Date: Tue, 11 Sep 2018 06:33:29 +0000 (+0800)
Subject: Skip openvswitch reinstall task for sfc
X-Git-Tag: opnfv-7.0.0~1^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cf11ce9b6d03365758e8ee9ad43f64b8170374a6;p=compass4nfv.git

Skip openvswitch reinstall task for sfc

JIRA: -

Change-Id: I56867d6c9b1f4db4c5f762e93dcf7164918c8ef9
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
index 2deecb3b..0ad47d3c 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"