From: CNlucius <lukai1@huawei.com>
Date: Thu, 7 Jul 2016 03:28:36 +0000 (+0800)
Subject: COMPASS-429
X-Git-Tag: colorado.1.0~96^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=68c872f91546416f6998b312421ecadee826a9fd;p=compass4nfv.git

COMPASS-429
onos_cluster tasks are executed in none onos scenario

Change-Id: I03a5d111d5822cbe88b87efd6c333ea65c5bdad9
Signed-off-by: CNlucius <lukai1@huawei.com>
---

diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/tasks/main.yml
index 687d27d1..c8ce1155 100755
--- a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/tasks/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/tasks/main.yml
@@ -18,6 +18,7 @@
 
 - name: shut down and disable Neutron's agent services
   service: name=neutron-plugin-openvswitch-agent state=stopped
+  when: groups['onos']|length !=0
   ignore_errors: True
 
 - name: remove neutron-l3-agent auto start
@@ -38,6 +39,7 @@
     ovs-vsctl del-br br-tun ;
     ovs-vsctl del-manager ;
     ip link delete onos_port1 type veth peer name onos_port2;
+  when: groups['onos']|length !=0
   ignore_errors: True
 
 - name: Install ONOS Cluster on Controller
@@ -46,5 +48,4 @@
 
 - name: Config ONOS Cluster
   include: openvswitch.yml
-  when: inventory_hostname in groups['onos']
-
+  when: groups['onos']|length !=0